Commit 8b11ff09 authored by Kent Overstreet's avatar Kent Overstreet Committed by Dominique Martinet
Browse files

9p: Add client parameter to p9_req_put() 

This is to aid in adding mempools, in the next patch.

Link: https://lkml.kernel.org/r/20220704014243.153050-2-kent.overstreet@gmail.com


Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent 6cda1286

include/net/9p/client.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline int p9_req_try_get(struct p9_req_t *r) 
	return refcount_inc_not_zero(&r->refcount);

}



int p9_req_put(struct p9_req_t *r);

int p9_req_put(struct p9_client *c, struct p9_req_t *r);



/* We cannot have the real tracepoints in header files,

 * use a wrapper function */

net/9p/client.c

+6 −6
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag) 
		if (!p9_req_try_get(req))

			goto again;

		if (req->tc.tag != tag) {

			p9_req_put(req);

			p9_req_put(c, req);

			goto again;

		}

	}
@@ -367,10 +367,10 @@ static int p9_tag_remove(struct p9_client *c, struct p9_req_t *r) 
	spin_lock_irqsave(&c->lock, flags);

	idr_remove(&c->reqs, tag);

	spin_unlock_irqrestore(&c->lock, flags);

	return p9_req_put(r);

	return p9_req_put(c, r);

}



int p9_req_put(struct p9_req_t *r)

int p9_req_put(struct p9_client *c, struct p9_req_t *r)

{

	if (refcount_dec_and_test(&r->refcount)) {

		p9_fcall_fini(&r->tc);
@@ -423,7 +423,7 @@ void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status) 


	wake_up(&req->wq);

	p9_debug(P9_DEBUG_MUX, "wakeup: %d\n", req->tc.tag);

	p9_req_put(req);

	p9_req_put(c, req);

}

EXPORT_SYMBOL(p9_client_cb);
@@ -706,7 +706,7 @@ static struct p9_req_t *p9_client_prepare_req(struct p9_client *c, 
reterr:

	p9_tag_remove(c, req);

	/* We have to put also the 2nd reference as it won't be used */

	p9_req_put(req);

	p9_req_put(c, req);

	return ERR_PTR(err);

}
@@ -743,7 +743,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) 
	err = c->trans_mod->request(c, req);

	if (err < 0) {

		/* write won't happen */

		p9_req_put(req);

		p9_req_put(c, req);

		if (err != -ERESTARTSYS && err != -EFAULT)

			c->status = Disconnected;

		goto recalc_sigpending;

net/9p/trans_fd.c

+6 −6
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void p9_read_work(struct work_struct *work) 
		m->rc.sdata = NULL;

		m->rc.offset = 0;

		m->rc.capacity = 0;

		p9_req_put(m->rreq);

		p9_req_put(m->client, m->rreq);

		m->rreq = NULL;

	}
@@ -492,7 +492,7 @@ static void p9_write_work(struct work_struct *work) 
	m->wpos += err;

	if (m->wpos == m->wsize) {

		m->wpos = m->wsize = 0;

		p9_req_put(m->wreq);

		p9_req_put(m->client, m->wreq);

		m->wreq = NULL;

	}
@@ -695,7 +695,7 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req) 
	if (req->status == REQ_STATUS_UNSENT) {

		list_del(&req->req_list);

		req->status = REQ_STATUS_FLSHD;

		p9_req_put(req);

		p9_req_put(client, req);

		ret = 0;

	}

	spin_unlock(&client->lock);
@@ -722,7 +722,7 @@ static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req) 
	list_del(&req->req_list);

	req->status = REQ_STATUS_FLSHD;

	spin_unlock(&client->lock);

	p9_req_put(req);

	p9_req_put(client, req);



	return 0;

}
@@ -883,12 +883,12 @@ static void p9_conn_destroy(struct p9_conn *m) 
	p9_mux_poll_stop(m);

	cancel_work_sync(&m->rq);

	if (m->rreq) {

		p9_req_put(m->rreq);

		p9_req_put(m->client, m->rreq);

		m->rreq = NULL;

	}

	cancel_work_sync(&m->wq);

	if (m->wreq) {

		p9_req_put(m->wreq);

		p9_req_put(m->client, m->wreq);

		m->wreq = NULL;

	}

net/9p/trans_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ send_done(struct ib_cq *cq, struct ib_wc *wc) 
			    c->busa, c->req->tc.size,

			    DMA_TO_DEVICE);

	up(&rdma->sq_sem);

	p9_req_put(c->req);

	p9_req_put(client, c->req);

	kfree(c);

}

net/9p/trans_virtio.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req) 
/* Reply won't come, so drop req ref */

static int p9_virtio_cancelled(struct p9_client *client, struct p9_req_t *req)

{

	p9_req_put(req);

	p9_req_put(client, req);

	return 0;

}
@@ -523,7 +523,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, 
	kvfree(out_pages);

	if (!kicked) {

		/* reply won't come */

		p9_req_put(req);

		p9_req_put(client, req);

	}

	return err;

}