diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:02 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:26:02 +0200 |
| commit | 8c91189a2a8f5e69457bea9f48350c48310cec5b (patch) | |
| tree | 02ccd38f0210037a45fa4f1e37b5b83a9bfe8fd1 /fs/fuse/dev.c | |
| parent | fuse: duplicate ->connected in iqueue (diff) | |
| download | linux-8c91189a2a8f5e69457bea9f48350c48310cec5b.tar.xz linux-8c91189a2a8f5e69457bea9f48350c48310cec5b.zip | |
fuse: abort: group iqueue accesses
Rearrange fuse_abort_conn() so that input queue accesses are grouped
together.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/fuse/dev.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index a24ead993650..deafbdf278c6 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2127,7 +2127,6 @@ void fuse_abort_conn(struct fuse_conn *fc) LIST_HEAD(to_end2); fc->connected = 0; - fiq->connected = 0; fc->blocked = 0; fuse_set_initialized(fc); list_for_each_entry_safe(req, next, &fc->io, list) { @@ -2140,7 +2139,14 @@ void fuse_abort_conn(struct fuse_conn *fc) } fc->max_background = UINT_MAX; flush_bg_queue(fc); + + fiq->connected = 0; list_splice_init(&fiq->pending, &to_end2); + while (forget_pending(fiq)) + kfree(dequeue_forget(fiq, 1, NULL)); + wake_up_all(&fiq->waitq); + kill_fasync(&fiq->fasync, SIGIO, POLL_IN); + list_splice_init(&fc->processing, &to_end2); while (!list_empty(&to_end1)) { req = list_first_entry(&to_end1, struct fuse_req, list); @@ -2149,12 +2155,8 @@ void fuse_abort_conn(struct fuse_conn *fc) spin_lock(&fc->lock); } end_requests(fc, &to_end2); - while (forget_pending(fiq)) - kfree(dequeue_forget(fiq, 1, NULL)); end_polls(fc); - wake_up_all(&fiq->waitq); wake_up_all(&fc->blocked_waitq); - kill_fasync(&fiq->fasync, SIGIO, POLL_IN); } spin_unlock(&fc->lock); } |