diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:07 +0200 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:07 +0200 |
commit | 1e6881c36ebbfd47298c42fa82b544c4988933fa (patch) | |
tree | c4ed8353c6aaa2cc6d8c4664a8ba181c966d569e /fs/fuse | |
parent | 365ae710df91edc97d24817e3271e01bffaaee32 (diff) | |
download | linux-1e6881c36ebbfd47298c42fa82b544c4988933fa.tar.bz2 |
fuse: cleanup request_end()
Now that we atomically test having already done everything we no longer
need other protection.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/dev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index cd242fc6a92b..4e1144a38438 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -383,14 +383,12 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) __releases(fc->lock) { struct fuse_iqueue *fiq = &fc->iq; - void (*end) (struct fuse_conn *, struct fuse_req *) = req->end; if (test_and_set_bit(FR_FINISHED, &req->flags)) { spin_unlock(&fc->lock); return; } - req->end = NULL; spin_lock(&fiq->waitq.lock); list_del_init(&req->intr_entry); spin_unlock(&fiq->waitq.lock); @@ -416,8 +414,8 @@ __releases(fc->lock) } spin_unlock(&fc->lock); wake_up(&req->waitq); - if (end) - end(fc, req); + if (req->end) + req->end(fc, req); fuse_put_request(fc, req); } |