Backport from ml:
commit 1e6881c36ebbfd47298c42fa82b544c4988933fa
Author: Miklos Szeredi <[email protected]>
Date: Wed Jul 1 16:26:07 2015 +0200
fuse: cleanup request_end()
Now that we atomically test having already done everything we no longer
need other protection.
Signed-off-by: Miklos Szeredi <[email protected]>
Reviewed-by: Ashish Samant <[email protected]>
Signed-off-by: Maxim Patlasov <[email protected]>
---
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 4d16a1c..d2ad658 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -366,14 +366,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);
@@ -399,8 +397,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);
}
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
