Re: [PATCH] rnbd-srv: remove 'dir' argument from rnbd_srv_rdma_ev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Aug 26, 2022 at 10:11 AM Guoqing Jiang <guoqing.jiang@xxxxxxxxx> wrote:
>
> Since all callers (process_{read,write}) set id->dir, no need to
> pass 'dir' again.
>
> Signed-off-by: Guoqing Jiang <guoqing.jiang@xxxxxxxxx>
> ---
>  drivers/block/rnbd/rnbd-srv.c          | 9 ++++-----
>  drivers/block/rnbd/rnbd-srv.h          | 1 +
>  drivers/infiniband/ulp/rtrs/rtrs-srv.c | 4 ++--
>  drivers/infiniband/ulp/rtrs/rtrs.h     | 3 +--
>  4 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
> index 3f6c268e04ef..9600715f1029 100644
> --- a/drivers/block/rnbd/rnbd-srv.c
> +++ b/drivers/block/rnbd/rnbd-srv.c
> @@ -368,10 +368,9 @@ 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(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,
> +                           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;
> @@ -398,7 +397,7 @@ static int rnbd_srv_rdma_ev(void *priv,
>                 break;
>         default:
>                 pr_warn("Received unexpected message type %d with dir %d from session %s\n",
> -                       type, dir, srv_sess->sessname);
> +                       type, id->dir, srv_sess->sessname);
>                 return -EINVAL;
>         }
>
> diff --git a/drivers/block/rnbd/rnbd-srv.h b/drivers/block/rnbd/rnbd-srv.h
> index 081bceaf4ae9..5a0ef6c2b5c7 100644
> --- a/drivers/block/rnbd/rnbd-srv.h
> +++ b/drivers/block/rnbd/rnbd-srv.h
> @@ -14,6 +14,7 @@
>  #include <linux/kref.h>
>
>  #include <rtrs.h>
> +#include <rtrs-srv.h>
why do we need this?
>  #include "rnbd-proto.h"
>  #include "rnbd-log.h"
>
> diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
> index 34c03bde5064..9dc50ff0e1b9 100644
> --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
> +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
> @@ -1024,7 +1024,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->priv, id, READ, data, data_len,
> +       ret = ctx->ops.rdma_ev(srv->priv, id, data, data_len,
>                            data + data_len, usr_len);
>
>         if (ret) {
> @@ -1077,7 +1077,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->priv, id, WRITE, data, data_len,
> +       ret = ctx->ops.rdma_ev(srv->priv, id, data, data_len,
>                                data + data_len, usr_len);
>         if (ret) {
>                 rtrs_err_rl(s,
> diff --git a/drivers/infiniband/ulp/rtrs/rtrs.h b/drivers/infiniband/ulp/rtrs/rtrs.h
> index 5e57a7ccc7fb..b48b53a7c143 100644
> --- a/drivers/infiniband/ulp/rtrs/rtrs.h
> +++ b/drivers/infiniband/ulp/rtrs/rtrs.h
> @@ -139,7 +139,6 @@ struct rtrs_srv_ops {
>
>          *      @priv:          Private data set by rtrs_srv_set_sess_priv()
>          *      @id:            internal RTRS operation id
> -        *      @dir:           READ/WRITE
>          *      @data:          Pointer to (bidirectional) rdma memory area:
>          *                      - in case of %RTRS_SRV_RDMA_EV_RECV contains
>          *                      data sent by the client
> @@ -151,7 +150,7 @@ struct rtrs_srv_ops {
>          *      @usrlen:        Size of the user message
>          */
>         int (*rdma_ev)(void *priv,
> -                      struct rtrs_srv_op *id, int dir,
> +                      struct rtrs_srv_op *id,
>                        void *data, size_t datalen, const void *usr,
>                        size_t usrlen);
>         /**
> --
> 2.31.1
>



[Index of Archives]     [Linux RAID]     [Linux SCSI]     [Linux ATA RAID]     [IDE]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Device Mapper]

  Powered by Linux