block/rnbd-srv: Remove unused arguments of rnbd_srv_rdma_ev

struct rtrs_srv is not used when handling rnbd_srv_rdma_ev messages, so
cleaned up
rdma_ev function pointer in rtrs_srv_ops also is changed.

Cc: Leon Romanovsky <leonro@nvidia.com>
Cc: linux-rdma@vger.kernel.org
Signed-off-by: Aleksei Marov <aleksei.marov@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20210419073722.15351-16-gi-oh.kim@ionos.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index a9bb414f74428f473ae0a603007a594caa9a54e2..abacd9ef10d6f0ee5a02dd1a1250dc2cc88f9903 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -114,8 +114,7 @@ rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess)
        return sess_dev;
 }
 
-static int process_rdma(struct rtrs_srv *sess,
-                       struct rnbd_srv_session *srv_sess,
+static int process_rdma(struct rnbd_srv_session *srv_sess,
                        struct rtrs_srv_op *id, void *data, u32 datalen,
                        const void *usr, size_t usrlen)
 {
@@ -344,8 +343,7 @@ void rnbd_srv_sess_dev_force_close(struct rnbd_srv_sess_dev *sess_dev,
        mutex_unlock(&sess->lock);
 }
 
-static int process_msg_close(struct rtrs_srv *rtrs,
-                            struct rnbd_srv_session *srv_sess,
+static int process_msg_close(struct rnbd_srv_session *srv_sess,
                             void *data, size_t datalen, const void *usr,
                             size_t usrlen)
 {
@@ -364,20 +362,18 @@ static int process_msg_close(struct rtrs_srv *rtrs,
        return 0;
 }
 
-static int process_msg_open(struct rtrs_srv *rtrs,
-                           struct rnbd_srv_session *srv_sess,
+static int process_msg_open(struct rnbd_srv_session *srv_sess,
                            const void *msg, size_t len,
                            void *data, size_t datalen);
 
-static int process_msg_sess_info(struct rtrs_srv *rtrs,
-                                struct rnbd_srv_session *srv_sess,
+static int process_msg_sess_info(struct rnbd_srv_session *srv_sess,
                                 const void *msg, size_t len,
                                 void *data, size_t datalen);
 
-static int rnbd_srv_rdma_ev(struct rtrs_srv *rtrs, void *priv,
-                            struct rtrs_srv_op *id, int dir,
-                            void *data, size_t datalen, const void *usr,
-                            size_t usrlen)
+static int rnbd_srv_rdma_ev(void *priv,
+                           struct rtrs_srv_op *id, int dir,
+                           void *data, size_t datalen, const void *usr,
+                           size_t usrlen)
 {
        struct rnbd_srv_session *srv_sess = priv;
        const struct rnbd_msg_hdr *hdr = usr;
@@ -391,19 +387,16 @@ static int rnbd_srv_rdma_ev(struct rtrs_srv *rtrs, void *priv,
 
        switch (type) {
        case RNBD_MSG_IO:
-               return process_rdma(rtrs, srv_sess, id, data, datalen, usr,
-                                   usrlen);
+               return process_rdma(srv_sess, id, data, datalen, usr, usrlen);
        case RNBD_MSG_CLOSE:
-               ret = process_msg_close(rtrs, srv_sess, data, datalen,
-                                       usr, usrlen);
+               ret = process_msg_close(srv_sess, data, datalen, usr, usrlen);
                break;
        case RNBD_MSG_OPEN:
-               ret = process_msg_open(rtrs, srv_sess, usr, usrlen,
-                                      data, datalen);
+               ret = process_msg_open(srv_sess, usr, usrlen, data, datalen);
                break;
        case RNBD_MSG_SESS_INFO:
-               ret = process_msg_sess_info(rtrs, srv_sess, usr, usrlen,
-                                           data, datalen);
+               ret = process_msg_sess_info(srv_sess, usr, usrlen, data,
+                                           datalen);
                break;
        default:
                pr_warn("Received unexpected message type %d with dir %d from session %s\n",
@@ -656,8 +649,7 @@ static char *rnbd_srv_get_full_path(struct rnbd_srv_session *srv_sess,
        return full_path;
 }
 
-static int process_msg_sess_info(struct rtrs_srv *rtrs,
-                                struct rnbd_srv_session *srv_sess,
+static int process_msg_sess_info(struct rnbd_srv_session *srv_sess,
                                 const void *msg, size_t len,
                                 void *data, size_t datalen)
 {
@@ -698,8 +690,7 @@ find_srv_sess_dev(struct rnbd_srv_session *srv_sess, const char *dev_name)
        return NULL;
 }
 
-static int process_msg_open(struct rtrs_srv *rtrs,
-                           struct rnbd_srv_session *srv_sess,
+static int process_msg_open(struct rnbd_srv_session *srv_sess,
                            const void *msg, size_t len,
                            void *data, size_t datalen)
 {

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index d071809e3ed2faf8c1faa6381da769575be4b1e7..f7aa2a7e744224b4004b81b5538681272b7281e9 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -998,7 +998,7 @@ static void process_read(struct rtrs_srv_con *con,
        usr_len = le16_to_cpu(msg->usr_len);
        data_len = off - usr_len;
        data = page_address(srv->chunks[buf_id]);
-       ret = ctx->ops.rdma_ev(srv, srv->priv, id, READ, data, data_len,
+       ret = ctx->ops.rdma_ev(srv->priv, id, READ, data, data_len,
                           data + data_len, usr_len);
 
        if (unlikely(ret)) {
@@ -1051,7 +1051,7 @@ static void process_write(struct rtrs_srv_con *con,
        usr_len = le16_to_cpu(req->usr_len);
        data_len = off - usr_len;
        data = page_address(srv->chunks[buf_id]);
-       ret = ctx->ops.rdma_ev(srv, srv->priv, id, WRITE, data, data_len,
+       ret = ctx->ops.rdma_ev(srv->priv, id, WRITE, data, data_len,
                           data + data_len, usr_len);
        if (unlikely(ret)) {
                rtrs_err_rl(s,

diff --git a/drivers/infiniband/ulp/rtrs/rtrs.h b/drivers/infiniband/ulp/rtrs/rtrs.h
index f891fbe7abe6f309a283768f230e39967f5e99fa..b0f56ffeff882b8b94bbe13d7b011c0a32516d10 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs.h
@@ -139,7 +139,6 @@ struct rtrs_srv_ops {
         *                      message for the data transfer will be sent to
         *                      the client.
 
-        *      @sess:          Session
         *      @priv:          Private data set by rtrs_srv_set_sess_priv()
         *      @id:            internal RTRS operation id
         *      @dir:           READ/WRITE
@@ -153,7 +152,7 @@ struct rtrs_srv_ops {
         *      @usr:           The extra user message sent by the client (%vec)
         *      @usrlen:        Size of the user message
         */
-       int (*rdma_ev)(struct rtrs_srv *sess, void *priv,
+       int (*rdma_ev)(void *priv,
                       struct rtrs_srv_op *id, int dir,
                       void *data, size_t datalen, const void *usr,
                       size_t usrlen);