mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
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>
This commit is contained in:
parent
ebc14c4dbe
commit
819c4b3b40
2 changed files with 8 additions and 2 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue