]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
fuse: abort: group pqueue accesses
authorMiklos Szeredi <mszeredi@suse.cz>
Wed, 1 Jul 2015 14:26:05 +0000 (16:26 +0200)
committerMiklos Szeredi <mszeredi@suse.cz>
Wed, 1 Jul 2015 14:26:05 +0000 (16:26 +0200)
Rearrange fuse_abort_conn() so that processing queue accesses are grouped
together.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
fs/fuse/dev.c

index 1ad75e4ceba52840c9da2a0c2150abd7b3cd5202..3e84300740704723841b57502debd20e741d0619 100644 (file)
@@ -2139,6 +2139,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);
 
@@ -2151,7 +2152,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);