diff options
| author | Miklos Szeredi | 2018-07-26 16:13:12 +0200 |
|---|---|---|
| committer | Miklos Szeredi | 2018-07-26 16:13:12 +0200 |
| commit | 75f3ee4c288d92d022481b4d9d56599714ca0ce3 (patch) | |
| tree | 792a42c27d7bc77fe4b862b5eb96ec874aefafeb /fs/fuse | |
| parent | 109728ccc5933151c68d1106e4065478a487a323 (diff) | |
fuse: simplify fuse_abort_conn()
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 4a9ace7280b9..de3d273c9366 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2101,8 +2101,7 @@ void fuse_abort_conn(struct fuse_conn *fc, bool is_abort) if (fc->connected) { struct fuse_dev *fud; struct fuse_req *req, *next; - LIST_HEAD(to_end1); - LIST_HEAD(to_end2); + LIST_HEAD(to_end); fc->connected = 0; fc->blocked = 0; @@ -2120,11 +2119,11 @@ void fuse_abort_conn(struct fuse_conn *fc, bool is_abort) if (!test_bit(FR_LOCKED, &req->flags)) { set_bit(FR_PRIVATE, &req->flags); __fuse_get_request(req); - list_move(&req->list, &to_end1); + list_move(&req->list, &to_end); } spin_unlock(&req->waitq.lock); } - list_splice_init(&fpq->processing, &to_end2); + list_splice_tail_init(&fpq->processing, &to_end); spin_unlock(&fpq->lock); } fc->max_background = UINT_MAX; @@ -2132,9 +2131,9 @@ void fuse_abort_conn(struct fuse_conn *fc, bool is_abort) spin_lock(&fiq->waitq.lock); fiq->connected = 0; - list_splice_init(&fiq->pending, &to_end2); - list_for_each_entry(req, &to_end2, list) + list_for_each_entry(req, &fiq->pending, list) clear_bit(FR_PENDING, &req->flags); + list_splice_tail_init(&fiq->pending, &to_end); while (forget_pending(fiq)) kfree(dequeue_forget(fiq, 1, NULL)); wake_up_all_locked(&fiq->waitq); @@ -2144,12 +2143,7 @@ void fuse_abort_conn(struct fuse_conn *fc, bool is_abort) wake_up_all(&fc->blocked_waitq); spin_unlock(&fc->lock); - while (!list_empty(&to_end1)) { - req = list_first_entry(&to_end1, struct fuse_req, list); - list_del_init(&req->list); - request_end(fc, req); - } - end_requests(fc, &to_end2); + end_requests(fc, &to_end); } else { spin_unlock(&fc->lock); } |