Skip to content

Commit

Permalink
fuse: abort: group iqueue accesses
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miklos Szeredi committed Jul 1, 2015
1 parent e16714d commit 8c91189
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand All @@ -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);
}
Expand Down

0 comments on commit 8c91189

Please sign in to comment.