Backport from ml:

commit 73e0e738441b26a2dfc1ccdf1462cd1dc13c8cea
Author: Miklos Szeredi <[email protected]>
Date:   Wed Jul 1 16:25:56 2015 +0200

    fuse: reset waiting

    Reset req->waiting in fuse_put_request().  This is needed for correct
    accounting in fc->num_waiting for reserved requests.

    Signed-off-by: Miklos Szeredi <[email protected]>

Signed-off-by: Maxim Patlasov <[email protected]>
---
 fs/fuse/dev.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 6022969..92ec220 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -259,8 +259,10 @@ void fuse_put_request(struct fuse_conn *fc, struct 
fuse_req *req)
                        spin_unlock(&fc->lock);
                }
 
-               if (req->waiting)
+               if (req->waiting) {
                        atomic_dec(&fc->num_waiting);
+                       req->waiting = 0;
+               }
 
                if (req->stolen_file)
                        put_reserved_req(fc, req);

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to