Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f98274 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: rework abort 



Splice fc->pending and fc->processing lists into a common kill list while
holding fc->lock.

By the time we release fc->lock, pending and processing lists are empty and
the io list contains only locked requests.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reviewed-by: default avatarAshish Samant <ashish.samant@oracle.com>
parent b716d425

fs/fuse/dev.c

+10 −11
Original line number Diff line number Diff line
@@ -2101,9 +2101,6 @@ static void end_polls(struct fuse_conn *fc) 
 * asynchronous request and the tricky deadlock (see

 * Documentation/filesystems/fuse.txt).

 *

 * Request progression from one list to the next is prevented by fc->connected

 * being false.

 *

 * Aborting requests under I/O goes as follows: 1: Separate out unlocked

 * requests, they should be finished off immediately.  Locked requests will be

 * finished after unlock; see unlock_request(). 2: Finish off the unlocked
@@ -2116,7 +2113,8 @@ void fuse_abort_conn(struct fuse_conn *fc) 
	spin_lock(&fc->lock);

	if (fc->connected) {

		struct fuse_req *req, *next;

		LIST_HEAD(to_end);

		LIST_HEAD(to_end1);

		LIST_HEAD(to_end2);



		fc->connected = 0;

		fc->blocked = 0;
@@ -2126,19 +2124,20 @@ void fuse_abort_conn(struct fuse_conn *fc) 
			spin_lock(&req->waitq.lock);

			set_bit(FR_ABORTED, &req->flags);

			if (!test_bit(FR_LOCKED, &req->flags))

				list_move(&req->list, &to_end);

				list_move(&req->list, &to_end1);

			spin_unlock(&req->waitq.lock);

		}

		while (!list_empty(&to_end)) {

			req = list_first_entry(&to_end, struct fuse_req, list);

		fc->max_background = UINT_MAX;

		flush_bg_queue(fc);

		list_splice_init(&fc->pending, &to_end2);

		list_splice_init(&fc->processing, &to_end2);

		while (!list_empty(&to_end1)) {

			req = list_first_entry(&to_end1, struct fuse_req, list);

			__fuse_get_request(req);

			request_end(fc, req);

			spin_lock(&fc->lock);

		}

		fc->max_background = UINT_MAX;

		flush_bg_queue(fc);

		end_requests(fc, &fc->pending);

		end_requests(fc, &fc->processing);

		end_requests(fc, &to_end2);

		while (forget_pending(fc))

			kfree(dequeue_forget(fc, 1, NULL));

		end_polls(fc);