| Message ID | 20221116111400.7203-2-guoqing.jiang@linux.dev (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Misc patches for rtrs | expand |
On Wed, Nov 16, 2022 at 12:14 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote: > > The RDMA_CM_EVENT_CONNECT_REQUEST is quite different to other types, > let's checking it separately at the beginning of routine, then we can > avoid the identation accordingly. There are two typos. s/checking/check s/identation/indentation. > > Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev> > --- > drivers/infiniband/ulp/rtrs/rtrs-srv.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c > index 22d7ba05e9fe..5fe3699cb8ff 100644 > --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c > +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c > @@ -1950,22 +1950,21 @@ static int rtrs_srv_rdma_cm_handler(struct rdma_cm_id *cm_id, > { > struct rtrs_srv_path *srv_path = NULL; > struct rtrs_path *s = NULL; > + struct rtrs_con *c = NULL; > > - if (ev->event != RDMA_CM_EVENT_CONNECT_REQUEST) { > - struct rtrs_con *c = cm_id->context; > - > - s = c->path; > - srv_path = to_srv_path(s); > - } > - > - switch (ev->event) { > - case RDMA_CM_EVENT_CONNECT_REQUEST: > + if (ev->event == RDMA_CM_EVENT_CONNECT_REQUEST) > /* > * In case of error cma.c will destroy cm_id, > * see cma_process_remove() > */ > return rtrs_rdma_connect(cm_id, ev->param.conn.private_data, > ev->param.conn.private_data_len); > + > + c = cm_id->context; > + s = c->path; > + srv_path = to_srv_path(s); > + > + switch (ev->event) { > case RDMA_CM_EVENT_ESTABLISHED: > /* Nothing here */ > break; > -- > 2.31.1 > The patch LGTM. Acked-by: Jack Wang <jinpu.wang@ionos.com>
On 11/17/22 1:52 PM, Jinpu Wang wrote: > On Wed, Nov 16, 2022 at 12:14 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote: >> The RDMA_CM_EVENT_CONNECT_REQUEST is quite different to other types, >> let's checking it separately at the beginning of routine, then we can >> avoid the identation accordingly. > There are two typos. > s/checking/check > s/identation/indentation. Thanks! Will send a new version to fix all of them. Guoqing
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c index 22d7ba05e9fe..5fe3699cb8ff 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -1950,22 +1950,21 @@ static int rtrs_srv_rdma_cm_handler(struct rdma_cm_id *cm_id, { struct rtrs_srv_path *srv_path = NULL; struct rtrs_path *s = NULL; + struct rtrs_con *c = NULL; - if (ev->event != RDMA_CM_EVENT_CONNECT_REQUEST) { - struct rtrs_con *c = cm_id->context; - - s = c->path; - srv_path = to_srv_path(s); - } - - switch (ev->event) { - case RDMA_CM_EVENT_CONNECT_REQUEST: + if (ev->event == RDMA_CM_EVENT_CONNECT_REQUEST) /* * In case of error cma.c will destroy cm_id, * see cma_process_remove() */ return rtrs_rdma_connect(cm_id, ev->param.conn.private_data, ev->param.conn.private_data_len); + + c = cm_id->context; + s = c->path; + srv_path = to_srv_path(s); + + switch (ev->event) { case RDMA_CM_EVENT_ESTABLISHED: /* Nothing here */ break;
The RDMA_CM_EVENT_CONNECT_REQUEST is quite different to other types, let's checking it separately at the beginning of routine, then we can avoid the identation accordingly. Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev> --- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)