Commit 267d8444 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

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: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 2e38bea9

fs/fuse/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, 
	if (err) {

		fuse_sync_release(ff, flags);

	} else {

		file->private_data = fuse_file_get(ff);

		file->private_data = ff;

		fuse_finish_open(inode, file);

	}

	return err;

fs/fuse/file.c

+9 −9
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) 
	}



	INIT_LIST_HEAD(&ff->write_entry);

	atomic_set(&ff->count, 0);

	atomic_set(&ff->count, 1);

	RB_CLEAR_NODE(&ff->polled_node);

	init_waitqueue_head(&ff->poll_wait);
@@ -75,7 +75,7 @@ void fuse_file_free(struct fuse_file *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);

	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->nodeid = nodeid;

	file->private_data = fuse_file_get(ff);

	file->private_data = ff;



	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)

{

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

	WARN_ON(atomic_read(&ff->count) != 1);

	fuse_prepare_release(ff, flags, FUSE_RELEASE);

	__set_bit(FR_FORCE, &ff->reserved_req->flags);

	__clear_bit(FR_BACKGROUND, &ff->reserved_req->flags);

	fuse_request_send(ff->fc, ff->reserved_req);

	fuse_put_request(ff->fc, ff->reserved_req);

	kfree(ff);

	/*

	 * 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);

}

EXPORT_SYMBOL_GPL(fuse_sync_release);

fs/fuse/fuse_i.h

+0 −1
Original line number Diff line number Diff line
@@ -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);



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);