openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fuse: cleanup fuse_file refcounting 

struct fuse_file is stored in file->private_data.  Make this always be a
counting reference for consistency.

This also allows fuse_sync_release() to call fuse_file_put() instead of
partially duplicating its functionality.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2017-02-22 20:08:25 +01:00
parent 2e38bea99a
commit 267d84449f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fuse/dir.c
View File

@ -473,7 +473,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
if (err) { if (err) {
fuse_sync_release(ff, flags); fuse_sync_release(ff, flags);
} else { } else {
file->private_data = fuse_file_get(ff); file->private_data = ff;
fuse_finish_open(inode, file); fuse_finish_open(inode, file);
} }
return err; return err;

18
fs/fuse/file.c
View File

@ -58,7 +58,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
} }
INIT_LIST_HEAD(&ff->write_entry); INIT_LIST_HEAD(&ff->write_entry);
atomic_set(&ff->count, 0); atomic_set(&ff->count, 1);
RB_CLEAR_NODE(&ff->polled_node); RB_CLEAR_NODE(&ff->polled_node);
init_waitqueue_head(&ff->poll_wait); init_waitqueue_head(&ff->poll_wait);
@ -75,7 +75,7 @@ void fuse_file_free(struct fuse_file *ff)
kfree(ff); kfree(ff);
} }
struct fuse_file *fuse_file_get(struct fuse_file *ff) static struct fuse_file *fuse_file_get(struct fuse_file *ff)
{ {
atomic_inc(&ff->count); atomic_inc(&ff->count);
return ff; return ff;
@ -147,7 +147,7 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
ff->open_flags &= ~FOPEN_DIRECT_IO; ff->open_flags &= ~FOPEN_DIRECT_IO;
ff->nodeid = nodeid; ff->nodeid = nodeid;
file->private_data = fuse_file_get(ff); file->private_data = ff;
return 0; return 0;
} }
@ -298,13 +298,13 @@ static int fuse_release(struct inode *inode, struct file *file)
void fuse_sync_release(struct fuse_file *ff, int flags) void fuse_sync_release(struct fuse_file *ff, int flags)
{ {
WARN_ON(atomic_read(&ff->count) > 1); WARN_ON(atomic_read(&ff->count) != 1);
fuse_prepare_release(ff, flags, FUSE_RELEASE); fuse_prepare_release(ff, flags, FUSE_RELEASE);
__set_bit(FR_FORCE, &ff->reserved_req->flags); /*
__clear_bit(FR_BACKGROUND, &ff->reserved_req->flags); * iput(NULL) is a no-op and since the refcount is 1 and everything's
fuse_request_send(ff->fc, ff->reserved_req); * synchronous, we are fine with not doing igrab() here"
fuse_put_request(ff->fc, ff->reserved_req); */
kfree(ff); fuse_file_put(ff, true);
} }
EXPORT_SYMBOL_GPL(fuse_sync_release); EXPORT_SYMBOL_GPL(fuse_sync_release);

1
fs/fuse/fuse_i.h
View File

@ -732,7 +732,6 @@ void fuse_read_fill(struct fuse_req *req, struct file *file,
int fuse_open_common(struct inode *inode, struct file *file, bool isdir); int fuse_open_common(struct inode *inode, struct file *file, bool isdir);
struct fuse_file *fuse_file_alloc(struct fuse_conn *fc); 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_file_free(struct fuse_file *ff);
void fuse_finish_open(struct inode *inode, struct file *file); void fuse_finish_open(struct inode *inode, struct file *file);