From 1e6881c36ebbfd47298c42fa82b544c4988933fa Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 1 Jul 2015 16:26:07 +0200 Subject: [PATCH] fuse: cleanup request_end() Now that we atomically test having already done everything we no longer need other protection. Signed-off-by: Miklos Szeredi Reviewed-by: Ashish Samant --- fs/fuse/dev.c | 6 ++---- 1 file 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); } -- 2.20.1