Commit 3a2b5b9c authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: separate out processing queue 



This is just two fields: fc->io and fc->processing.

This patch just rearranges the fields, no functional change.

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

fs/fuse/dev.c

+12 −9
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, 
{

	int err;

	struct fuse_iqueue *fiq = &fc->iq;

	struct fuse_pqueue *fpq = &fc->pq;

	struct fuse_req *req;

	struct fuse_in *in;

	unsigned reqsize;
@@ -1280,7 +1281,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, 
	spin_unlock(&fiq->waitq.lock);



	spin_lock(&fc->lock);

	list_add(&req->list, &fc->io);

	list_add(&req->list, &fpq->io);



	in = &req->in;

	reqsize = in->h.len;
@@ -1314,7 +1315,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, 
	if (!test_bit(FR_ISREPLY, &req->flags)) {

		request_end(fc, req);

	} else {

		list_move_tail(&req->list, &fc->processing);

		list_move_tail(&req->list, &fpq->processing);

		set_bit(FR_SENT, &req->flags);

		/* matches barrier in request_wait_answer() */

		smp_mb__after_atomic();
@@ -1815,11 +1816,11 @@ static int fuse_notify(struct fuse_conn *fc, enum fuse_notify_code code, 
}



/* Look up request on processing list by unique ID */

static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique)

static struct fuse_req *request_find(struct fuse_pqueue *fpq, u64 unique)

{

	struct fuse_req *req;



	list_for_each_entry(req, &fc->processing, list) {

	list_for_each_entry(req, &fpq->processing, list) {

		if (req->in.h.unique == unique || req->intr_unique == unique)

			return req;

	}
@@ -1860,6 +1861,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, 
				 struct fuse_copy_state *cs, size_t nbytes)

{

	int err;

	struct fuse_pqueue *fpq = &fc->pq;

	struct fuse_req *req;

	struct fuse_out_header oh;
@@ -1892,7 +1894,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, 
	if (!fc->connected)

		goto err_unlock;



	req = request_find(fc, oh.unique);

	req = request_find(fpq, oh.unique);

	if (!req)

		goto err_unlock;
@@ -1913,7 +1915,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, 
	}



	clear_bit(FR_SENT, &req->flags);

	list_move(&req->list, &fc->io);

	list_move(&req->list, &fpq->io);

	req->out.h = oh;

	set_bit(FR_LOCKED, &req->flags);

	cs->req = req;
@@ -2112,6 +2114,7 @@ static void end_polls(struct fuse_conn *fc) 
void fuse_abort_conn(struct fuse_conn *fc)

{

	struct fuse_iqueue *fiq = &fc->iq;

	struct fuse_pqueue *fpq = &fc->pq;



	spin_lock(&fc->lock);

	if (fc->connected) {
@@ -2122,7 +2125,7 @@ void fuse_abort_conn(struct fuse_conn *fc) 
		fc->connected = 0;

		fc->blocked = 0;

		fuse_set_initialized(fc);

		list_for_each_entry_safe(req, next, &fc->io, list) {

		list_for_each_entry_safe(req, next, &fpq->io, list) {

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

			spin_lock(&req->waitq.lock);

			set_bit(FR_ABORTED, &req->flags);
@@ -2142,7 +2145,7 @@ void fuse_abort_conn(struct fuse_conn *fc) 
		spin_unlock(&fiq->waitq.lock);

		kill_fasync(&fiq->fasync, SIGIO, POLL_IN);



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

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

		while (!list_empty(&to_end1)) {

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

			__fuse_get_request(req);
@@ -2161,7 +2164,7 @@ int fuse_dev_release(struct inode *inode, struct file *file) 
{

	struct fuse_conn *fc = fuse_get_conn(file);

	if (fc) {

		WARN_ON(!list_empty(&fc->io));

		WARN_ON(!list_empty(&fc->pq.io));

		WARN_ON(fc->iq.fasync != NULL);

		fuse_abort_conn(fc);

		fuse_conn_put(fc);

fs/fuse/fuse_i.h

+10 −5
Original line number Diff line number Diff line
@@ -401,6 +401,14 @@ struct fuse_iqueue { 
	struct fasync_struct *fasync;

};



struct fuse_pqueue {

	/** The list of requests being processed */

	struct list_head processing;



	/** The list of requests under I/O */

	struct list_head io;

};



/**

 * A Fuse connection.

 *
@@ -435,11 +443,8 @@ struct fuse_conn { 
	/** Input queue */

	struct fuse_iqueue iq;



	/** The list of requests being processed */

	struct list_head processing;



	/** The list of requests under I/O */

	struct list_head io;

	/** Processing queue */

	struct fuse_pqueue pq;



	/** The next unique kernel file handle */

	u64 khctr;

fs/fuse/inode.c

+8 −2
Original line number Diff line number Diff line
@@ -577,6 +577,13 @@ static void fuse_iqueue_init(struct fuse_iqueue *fiq) 
	fiq->connected = 1;

}



static void fuse_pqueue_init(struct fuse_pqueue *fpq)

{

	memset(fpq, 0, sizeof(struct fuse_pqueue));

	INIT_LIST_HEAD(&fpq->processing);

	INIT_LIST_HEAD(&fpq->io);

}



void fuse_conn_init(struct fuse_conn *fc)

{

	memset(fc, 0, sizeof(*fc));
@@ -586,8 +593,7 @@ void fuse_conn_init(struct fuse_conn *fc) 
	init_waitqueue_head(&fc->blocked_waitq);

	init_waitqueue_head(&fc->reserved_req_waitq);

	fuse_iqueue_init(&fc->iq);

	INIT_LIST_HEAD(&fc->processing);

	INIT_LIST_HEAD(&fc->io);

	fuse_pqueue_init(&fc->pq);

	INIT_LIST_HEAD(&fc->bg_queue);

	INIT_LIST_HEAD(&fc->entry);

	atomic_set(&fc->num_waiting, 0);