Commit e26ee4ef authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

fuse: allocate ff->release_args only if release is needed 



This removed the need to pass isdir argument to fuse_put_file().

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 0c9d7089

fs/fuse/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, 
		goto out_err;



	err = -ENOMEM;

	ff = fuse_file_alloc(fm);

	ff = fuse_file_alloc(fm, true);

	if (!ff)

		goto out_put_forget_req;

fs/fuse/file.c

+39 −30
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct fuse_release_args { 
	struct inode *inode;

};



struct fuse_file *fuse_file_alloc(struct fuse_mount *fm)

struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release)

{

	struct fuse_file *ff;
@@ -65,12 +65,14 @@ struct fuse_file *fuse_file_alloc(struct fuse_mount *fm) 
		return NULL;



	ff->fm = fm;

	if (release) {

		ff->release_args = kzalloc(sizeof(*ff->release_args),

					   GFP_KERNEL_ACCOUNT);

		if (!ff->release_args) {

			kfree(ff);

			return NULL;

		}

	}



	INIT_LIST_HEAD(&ff->write_entry);

	mutex_init(&ff->readdir.lock);
@@ -105,14 +107,14 @@ static void fuse_release_end(struct fuse_mount *fm, struct fuse_args *args, 
	kfree(ra);

}



static void fuse_file_put(struct fuse_file *ff, bool sync, bool isdir)

static void fuse_file_put(struct fuse_file *ff, bool sync)

{

	if (refcount_dec_and_test(&ff->count)) {

		struct fuse_args *args = &ff->release_args->args;

		struct fuse_release_args *ra = ff->release_args;

		struct fuse_args *args = (ra ? &ra->args : NULL);



		if (isdir ? ff->fm->fc->no_opendir : ff->fm->fc->no_open) {

			/* Do nothing when client does not implement 'open' */

			fuse_release_end(ff->fm, args, 0);

		if (!args) {

			/* Do nothing when server does not implement 'open' */

		} else if (sync) {

			fuse_simple_request(ff->fm, args);

			fuse_release_end(ff->fm, args, 0);
@@ -132,15 +134,16 @@ struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid, 
	struct fuse_conn *fc = fm->fc;

	struct fuse_file *ff;

	int opcode = isdir ? FUSE_OPENDIR : FUSE_OPEN;

	bool open = isdir ? !fc->no_opendir : !fc->no_open;



	ff = fuse_file_alloc(fm);

	ff = fuse_file_alloc(fm, open);

	if (!ff)

		return ERR_PTR(-ENOMEM);



	ff->fh = 0;

	/* Default for no-open */

	ff->open_flags = FOPEN_KEEP_CACHE | (isdir ? FOPEN_CACHE_DIR : 0);

	if (isdir ? !fc->no_opendir : !fc->no_open) {

	if (open) {

		struct fuse_open_out outarg;

		int err;
@@ -148,11 +151,13 @@ struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid, 
		if (!err) {

			ff->fh = outarg.fh;

			ff->open_flags = outarg.open_flags;



		} else if (err != -ENOSYS) {

			fuse_file_free(ff);

			return ERR_PTR(err);

		} else {

			/* No release needed */

			kfree(ff->release_args);

			ff->release_args = NULL;

			if (isdir)

				fc->no_opendir = 1;

			else
@@ -278,7 +283,7 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir) 
}



static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff,

				 unsigned int flags, int opcode)

				 unsigned int flags, int opcode, bool sync)

{

	struct fuse_conn *fc = ff->fm->fc;

	struct fuse_release_args *ra = ff->release_args;
@@ -296,6 +301,9 @@ static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff, 


	wake_up_interruptible_all(&ff->poll_wait);



	if (!ra)

		return;



	ra->inarg.fh = ff->fh;

	ra->inarg.flags = flags;

	ra->args.in_numargs = 1;
@@ -305,6 +313,13 @@ static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff, 
	ra->args.nodeid = ff->nodeid;

	ra->args.force = true;

	ra->args.nocreds = true;



	/*

	 * Hold inode until release is finished.

	 * From fuse_sync_release() the refcount is 1 and everything's

	 * synchronous, so we are fine with not doing igrab() here.

	 */

	ra->inode = sync ? NULL : igrab(&fi->inode);

}



void fuse_file_release(struct inode *inode, struct fuse_file *ff,
@@ -314,14 +329,12 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff, 
	struct fuse_release_args *ra = ff->release_args;

	int opcode = isdir ? FUSE_RELEASEDIR : FUSE_RELEASE;



	fuse_prepare_release(fi, ff, open_flags, opcode);

	fuse_prepare_release(fi, ff, open_flags, opcode, false);



	if (ff->flock) {

	if (ra && ff->flock) {

		ra->inarg.release_flags |= FUSE_RELEASE_FLOCK_UNLOCK;

		ra->inarg.lock_owner = fuse_lock_owner_id(ff->fm->fc, id);

	}

	/* Hold inode until release is finished */

	ra->inode = igrab(inode);



	/*

	 * Normally this will send the RELEASE request, however if
@@ -332,7 +345,7 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff, 
	 * synchronous RELEASE is allowed (and desirable) in this case

	 * because the server can be trusted not to screw up.

	 */

	fuse_file_put(ff, ff->fm->fc->destroy, isdir);

	fuse_file_put(ff, ff->fm->fc->destroy);

}



void fuse_release_common(struct file *file, bool isdir)
@@ -367,12 +380,8 @@ void fuse_sync_release(struct fuse_inode *fi, struct fuse_file *ff, 
		       unsigned int flags)

{

	WARN_ON(refcount_read(&ff->count) > 1);

	fuse_prepare_release(fi, ff, flags, FUSE_RELEASE);

	/*

	 * iput(NULL) is a no-op and since the refcount is 1 and everything's

	 * synchronous, we are fine with not doing igrab() here"

	 */

	fuse_file_put(ff, true, false);

	fuse_prepare_release(fi, ff, flags, FUSE_RELEASE, true);

	fuse_file_put(ff, true);

}

EXPORT_SYMBOL_GPL(fuse_sync_release);
@@ -929,7 +938,7 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args, 
		put_page(page);

	}

	if (ia->ff)

		fuse_file_put(ia->ff, false, false);

		fuse_file_put(ia->ff, false);



	fuse_io_free(ia);

}
@@ -1705,7 +1714,7 @@ static void fuse_writepage_free(struct fuse_writepage_args *wpa) 
		__free_page(ap->pages[i]);



	if (wpa->ia.ff)

		fuse_file_put(wpa->ia.ff, false, false);

		fuse_file_put(wpa->ia.ff, false);



	kfree(ap->pages);

	kfree(wpa);
@@ -1947,7 +1956,7 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc) 
	ff = __fuse_write_file_get(fi);

	err = fuse_flush_times(inode, ff);

	if (ff)

		fuse_file_put(ff, false, false);

		fuse_file_put(ff, false);



	return err;

}
@@ -2345,7 +2354,7 @@ static int fuse_writepages(struct address_space *mapping, 
		fuse_writepages_send(&data);

	}

	if (data.ff)

		fuse_file_put(data.ff, false, false);

		fuse_file_put(data.ff, false);



	kfree(data.orig_pages);

out:

fs/fuse/fuse_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos, 
 */

int fuse_open_common(struct inode *inode, struct file *file, bool isdir);



struct fuse_file *fuse_file_alloc(struct fuse_mount *fm);

struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release);

void fuse_file_free(struct fuse_file *ff);

void fuse_finish_open(struct inode *inode, struct file *file);