Backport from ml:

commit 24b4d33d46e9c4c671a43f2640d80fe1159f488c
Author: Miklos Szeredi <[email protected]>
Date:   Wed Jul 1 16:26:05 2015 +0200

    fuse: abort: group pqueue accesses

    Rearrange fuse_abort_conn() so that processing queue accesses are grouped
    together.

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

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

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 3659da7..0191c17 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -2133,6 +2133,7 @@ void fuse_abort_conn(struct fuse_conn *fc)
                                list_move(&req->list, &to_end1);
                        spin_unlock(&req->waitq.lock);
                }
+               list_splice_init(&fpq->processing, &to_end2);
                fc->max_background = UINT_MAX;
                flush_bg_queue(fc);
 
@@ -2145,7 +2146,6 @@ void fuse_abort_conn(struct fuse_conn *fc)
                spin_unlock(&fiq->waitq.lock);
                kill_fasync(&fiq->fasync, SIGIO, POLL_IN);
 
-               list_splice_init(&fpq->processing, &to_end2);
                while (!list_empty(&to_end1)) {
                        req = list_first_entry(&to_end1, struct fuse_req, list);
                        __fuse_get_request(req);

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

Reply via email to