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

Commit 77cd9d48 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: add req flag for private list 



When an unlocked request is aborted, it is moved from fpq->io to a private
list.  Then, after unlocking fpq->lock, the private list is processed and
the requests are finished off.

To protect the private list, we need to mark the request with a flag, so if
in the meantime the request is unlocked the list is not corrupted.

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

fs/fuse/dev.c

+7 −3
Original line number Diff line number Diff line
@@ -1328,6 +1328,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, 
	return reqsize;



out_end:

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

		list_del_init(&req->list);

	spin_unlock(&fpq->lock);

	request_end(fc, req);
@@ -1945,6 +1946,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, 
		err = -ENOENT;

	else if (err)

		req->out.h.error = -EIO;

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

		list_del_init(&req->list);

	spin_unlock(&fpq->lock);

	request_end(fc, req);
@@ -2149,8 +2151,10 @@ void fuse_abort_conn(struct fuse_conn *fc) 
			req->out.h.error = -ECONNABORTED;

			spin_lock(&req->waitq.lock);

			set_bit(FR_ABORTED, &req->flags);

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

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

				set_bit(FR_PRIVATE, &req->flags);

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

			}

			spin_unlock(&req->waitq.lock);

		}

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

fs/fuse/fuse_i.h

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ struct fuse_io_priv { 
 * FR_PENDING:		request is not yet in userspace

 * FR_SENT:		request is in userspace, waiting for an answer

 * FR_FINISHED:		request is finished

 * FR_PRIVATE:		request is on private list

 */

enum fuse_req_flag {

	FR_ISREPLY,
@@ -281,6 +282,7 @@ enum fuse_req_flag { 
	FR_PENDING,

	FR_SENT,

	FR_FINISHED,

	FR_PRIVATE,

};



/**