diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:05 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:05 +0200 |
| commit | 24b4d33d46e9c4c671a43f2640d80fe1159f488c (patch) | |
| tree | 4914e356133d537dd211aca5411b95114615e95d /fs/fuse | |
| parent | 82cbdcd320852ca68c8d43e8aacce2c07e7c1d4e (diff) | |
| download | linux-stable-24b4d33d46e9c4c671a43f2640d80fe1159f488c.tar.gz linux-stable-24b4d33d46e9c4c671a43f2640d80fe1159f488c.tar.bz2 linux-stable-24b4d33d46e9c4c671a43f2640d80fe1159f488c.zip | |
fuse: abort: group pqueue accesses
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>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 1ad75e4ceba5..3e8430074070 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -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); |