9p: Add client parameter to p9_req_put()

[ Upstream commit def3fb7d83b59d783b91115d9421552c460e89cb ]

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: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 67c854d07d7eafc9fa7ae1db18974cef928ff388..7060de84c55937a72a6935cc6dd9cdd2c67e53e3 100644 (file)
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -237,7 +237,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);
 
 void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status);
 

diff --git a/net/9p/client.c b/net/9p/client.c
index 5835fe4aebd7be5e3172f84535c54ee4d923e83f..866f02e88c79db7fd66ccbf1431bcd9488edbe8f 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -343,7 +343,7 @@ again:
                if (!p9_req_try_get(req))
                        goto again;
                if (req->tc.tag != tag) {
-                       p9_req_put(req);
+                       p9_req_put(c, req);
                        goto again;
                }
        }
@@ -369,10 +369,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);
@@ -425,7 +425,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);
 
@@ -708,7 +708,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);
 }
 
@@ -745,7 +745,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;

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 007bbcc68010b3a78c0e8567d05e8832f08466c1..c55c8a608bc79b4f6b47e30306e9daccbc1c1421 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -380,7 +380,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;
        }
 
@@ -494,7 +494,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;
        }
 
@@ -697,7 +697,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);
@@ -724,7 +724,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;
 }
@@ -885,12 +885,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;
        }
 

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index af0a8a6cd3fd8f7aa280ca70b81e3c0ab861568d..f6d145873b497d2a303534334c506cb356379e5a 100644 (file)
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -352,7 +352,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);
 }
 

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 490a4c9003395cbd4111723749635b32a6e2187c..d110df3cb4e1d3018087eda0d0673e4de5b0188c 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -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 @@ err_out:
        kvfree(out_pages);
        if (!kicked) {
                /* reply won't come */
-               p9_req_put(req);
+               p9_req_put(client, req);
        }
        return err;
 }

diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
index 432ac5a16f2e04243aa88eac3ab309558ef28313..427f6caefa29f945e693625fae3b321e210cf28e 100644 (file)
--- a/net/9p/trans_xen.c
+++ b/net/9p/trans_xen.c
@@ -186,7 +186,7 @@ again:
        ring->intf->out_prod = prod;
        spin_unlock_irqrestore(&ring->lock, flags);
        notify_remote_via_irq(ring->irq);
-       p9_req_put(p9_req);
+       p9_req_put(client, p9_req);
 
        return 0;
 }