Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7b7143c authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: clean up args in fuse_finish_open() and fuse_release_fill() 



Move setting ff->fh, ff->nodeid and file->private_data outside
fuse_finish_open().  Add ->open_flags member to struct fuse_file.

This simplifies the argument passing to fuse_finish_open() and
fuse_release_fill(), and paves the way for creating an open helper
that doesn't need an inode pointer.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent 2106cb18

fs/fuse/dir.c

+9 −7
Original line number Diff line number Diff line
@@ -365,9 +365,9 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, 
 * Synchronous release for the case when something goes wrong in CREATE_OPEN

 */

static void fuse_sync_release(struct fuse_conn *fc, struct fuse_file *ff,

			      u64 nodeid, int flags)

			      int flags)

{

	fuse_release_fill(ff, nodeid, flags, FUSE_RELEASE);

	fuse_release_fill(ff, flags, FUSE_RELEASE);

	ff->reserved_req->force = 1;

	fuse_request_send(fc, ff->reserved_req);

	fuse_put_request(fc, ff->reserved_req);
@@ -445,12 +445,14 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, 
		goto out_free_ff;



	fuse_put_request(fc, req);

	ff->fh = outopen.fh;

	ff->nodeid = outentry.nodeid;

	ff->open_flags = outopen.open_flags;

	inode = fuse_iget(dir->i_sb, outentry.nodeid, outentry.generation,

			  &outentry.attr, entry_attr_timeout(&outentry), 0);

	if (!inode) {

		flags &= ~(O_CREAT | O_EXCL | O_TRUNC);

		ff->fh = outopen.fh;

		fuse_sync_release(fc, ff, outentry.nodeid, flags);

		fuse_sync_release(fc, ff, flags);

		fuse_send_forget(fc, forget_req, outentry.nodeid, 1);

		return -ENOMEM;

	}
@@ -460,11 +462,11 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, 
	fuse_invalidate_attr(dir);

	file = lookup_instantiate_filp(nd, entry, generic_file_open);

	if (IS_ERR(file)) {

		ff->fh = outopen.fh;

		fuse_sync_release(fc, ff, outentry.nodeid, flags);

		fuse_sync_release(fc, ff, flags);

		return PTR_ERR(file);

	}

	fuse_finish_open(inode, file, ff, &outopen);

	file->private_data = fuse_file_get(ff);

	fuse_finish_open(inode, file);

	return 0;



 out_free_ff:

fs/fuse/file.c

+15 −13
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void fuse_file_free(struct fuse_file *ff) 
	kfree(ff);

}



static struct fuse_file *fuse_file_get(struct fuse_file *ff)

struct fuse_file *fuse_file_get(struct fuse_file *ff)

{

	atomic_inc(&ff->count);

	return ff;
@@ -102,18 +102,16 @@ static void fuse_file_put(struct fuse_file *ff) 
	}

}



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

		      struct fuse_file *ff, struct fuse_open_out *outarg)

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

{

	if (outarg->open_flags & FOPEN_DIRECT_IO)

	struct fuse_file *ff = file->private_data;



	if (ff->open_flags & FOPEN_DIRECT_IO)

		file->f_op = &fuse_direct_io_file_operations;

	if (!(outarg->open_flags & FOPEN_KEEP_CACHE))

	if (!(ff->open_flags & FOPEN_KEEP_CACHE))

		invalidate_inode_pages2(inode->i_mapping);

	if (outarg->open_flags & FOPEN_NONSEEKABLE)

	if (ff->open_flags & FOPEN_NONSEEKABLE)

		nonseekable_open(inode, file);

	ff->fh = outarg->fh;

	ff->nodeid = get_node_id(inode);

	file->private_data = fuse_file_get(ff);

}



int fuse_open_common(struct inode *inode, struct file *file, int isdir)
@@ -141,13 +139,17 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir) 
	else {

		if (isdir)

			outarg.open_flags &= ~FOPEN_DIRECT_IO;

		fuse_finish_open(inode, file, ff, &outarg);

		ff->fh = outarg.fh;

		ff->nodeid = get_node_id(inode);

		ff->open_flags = outarg.open_flags;

		file->private_data = fuse_file_get(ff);

		fuse_finish_open(inode, file);

	}



	return err;

}



void fuse_release_fill(struct fuse_file *ff, u64 nodeid, int flags, int opcode)

void fuse_release_fill(struct fuse_file *ff, int flags, int opcode)

{

	struct fuse_req *req = ff->reserved_req;

	struct fuse_release_in *inarg = &req->misc.release.in;
@@ -155,7 +157,7 @@ void fuse_release_fill(struct fuse_file *ff, u64 nodeid, int flags, int opcode) 
	inarg->fh = ff->fh;

	inarg->flags = flags;

	req->in.h.opcode = opcode;

	req->in.h.nodeid = nodeid;

	req->in.h.nodeid = ff->nodeid;

	req->in.numargs = 1;

	req->in.args[0].size = sizeof(struct fuse_release_in);

	req->in.args[0].value = inarg;
@@ -174,7 +176,7 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir) 
	fc = get_fuse_conn(inode);

	req = ff->reserved_req;



	fuse_release_fill(ff, get_node_id(inode), file->f_flags,

	fuse_release_fill(ff, file->f_flags,

			  isdir ? FUSE_RELEASEDIR : FUSE_RELEASE);



	/* Hold vfsmount and dentry until release is finished */

fs/fuse/fuse_i.h

+6 −3
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ struct fuse_file { 
	/** Refcount */

	atomic_t count;



	/** FOPEN_* flags returned by open */

	u32 open_flags;



	/** Entry on inode's write_files list */

	struct list_head write_entry;
@@ -528,12 +531,12 @@ void fuse_read_fill(struct fuse_req *req, struct file *file, 
int fuse_open_common(struct inode *inode, struct file *file, int isdir);



struct fuse_file *fuse_file_alloc(struct fuse_conn *fc);

struct fuse_file *fuse_file_get(struct fuse_file *ff);

void fuse_file_free(struct fuse_file *ff);

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

		      struct fuse_file *ff, struct fuse_open_out *outarg);

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



/** Fill in ff->reserved_req with a RELEASE request */

void fuse_release_fill(struct fuse_file *ff, u64 nodeid, int flags, int opcode);

void fuse_release_fill(struct fuse_file *ff, int flags, int opcode);



/**

 * Send RELEASE or RELEASEDIR request