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

[Guoqing Jiang <guoqing.jiang@linux.dev>]

On 8/30/22 4:44 PM, Leon Romanovsky wrote:
> On Mon, Aug 29, 2022 at 03:43:43PM +0200, Jinpu Wang wrote:
>> On Mon, Aug 29, 2022 at 3:33 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote:
>>>
>>>
>>> On 8/29/22 3:44 PM, Leon Romanovsky wrote:
>>>> On Fri, Aug 26, 2022 at 04:11:17PM +0800, Guoqing Jiang wrote:
>>>>> Since all callers (process_{read,write}) set id->dir, no need to
>>>>> pass 'dir' again.
>>>>>
>>>>> Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
>>>>> ---
>>>>>    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(-)
>>>> I applied the patch and cleanup of rtrs-srv.h can be done later.
>>> Thanks! I suppose below
>>>
>>>> So decouple it from rtrs-srv.h and hide everything that not-needed to be
>>>> exported to separate header file.
>>> means move 'struct rtrs_srv_op' to rtrs.h, which seems not appropriate to me
>>> because both client and server include the header. Pls correct me if I
>>> am wrong.
>>>
>>> Since process_{read,write} prints direction info if ctx->ops.rdma_ev
>>> fails, how
>>> about remove the 'dir' info from rnbd_srv_rdma_ev? Then we  don't need to
>>> include rtrs-srv.h.
>>>
>>> diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
>>> index 431c6da19d3f..d07ff3ba560c 100644
>>> --- a/drivers/block/rnbd/rnbd-srv.c
>>> +++ b/drivers/block/rnbd/rnbd-srv.c
>>> @@ -387,8 +387,8 @@ static int rnbd_srv_rdma_ev(void *priv, struct
>>> rtrs_srv_op *id,
>>>                                               datalen);
>>>                   break;
>>>           default:
>>> -               pr_warn("Received unexpected message type %d with dir %d
>>> from session %s\n",
>>> -                       type, id->dir, srv_sess->sessname);
>>> +               pr_warn("Received unexpected message type %d from
>>> session %s\n",
>>> +                       type, srv_sess->sessname);
>>>                   return -EINVAL;
>>>           }
>>>
>>> diff --git a/drivers/block/rnbd/rnbd-srv.h b/drivers/block/rnbd/rnbd-srv.h
>>> index 5a0ef6c2b5c7..081bceaf4ae9 100644
>>> --- a/drivers/block/rnbd/rnbd-srv.h
>>> +++ b/drivers/block/rnbd/rnbd-srv.h
>>> @@ -14,7 +14,6 @@
>>>    #include <linux/kref.h>
>>>
>>>    #include <rtrs.h>
>>> -#include <rtrs-srv.h>
>>>    #include "rnbd-proto.h"
>>>    #include "rnbd-log.h"
>>>
>>>
>>> Thoughts?
>> I like the idea. Please post a formal patch based on leon's
>> https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=wip/leon-for-next
> I squashed this hunk into original patch.

Great, thank you!

If possible, to better reflect the change, please at your convenience to 
replace the original commit
message with below.

"Since process_{read,write} already prints direction info if 
ctx->ops.rdma_ev fails, no need to pass 'dir'"

Thanks,
Guoqing