diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2007-10-16 23:31:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:43:04 -0700 |
| commit | 819c4b3b4009275caae973691378235c177a1429 (patch) | |
| tree | a959e68702db2359f52ffdf23644c3aa0be176ce | |
| parent | ebc14c4dbeb56195950058db9aa32de06c22de0d (diff) | |
| download | linux-819c4b3b4009275caae973691378235c177a1429.tar.gz linux-819c4b3b4009275caae973691378235c177a1429.tar.bz2 linux-819c4b3b4009275caae973691378235c177a1429.zip | |
fuse: cleanup in release
Move dput/mntput pair from request_end() to fuse_release_end(), because
there's no other place they are used.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/fuse/dev.c | 2 | ||||
| -rw-r--r-- | fs/fuse/file.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index de25bff31420..c78f60e1ba5d 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -231,8 +231,6 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) fc->num_background--; } spin_unlock(&fc->lock); - dput(req->dentry); - mntput(req->vfsmount); wake_up(&req->waitq); if (end) end(fc, req); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index f3ef2bde983b..c4b98c03a46e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -71,11 +71,19 @@ static struct fuse_file *fuse_file_get(struct fuse_file *ff) return ff; } +static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req) +{ + dput(req->dentry); + mntput(req->vfsmount); + fuse_put_request(fc, req); +} + static void fuse_file_put(struct fuse_file *ff) { if (atomic_dec_and_test(&ff->count)) { struct fuse_req *req = ff->reserved_req; struct fuse_conn *fc = get_fuse_conn(req->dentry->d_inode); + req->end = fuse_release_end; request_send_background(fc, req); kfree(ff); } |