| Message ID | 1489044405-26150-1-git-send-email-yanjun.zhu@oracle.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 3/8/2017 11:26 PM, Zhu Yanjun wrote: > When rdma_accept fails, rdma_reject is called in it. As such, it is > not necessary to execute rdma_reject again. > > Cc: Joe Jin <joe.jin@oracle.com> > Cc: Junxiao Bi <junxiao.bi@oracle.com> > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> > --- > net/rds/ib_cm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c > index ce3775a..eca3d5f 100644 > --- a/net/rds/ib_cm.c > +++ b/net/rds/ib_cm.c > @@ -677,8 +677,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id, > event->param.conn.initiator_depth); > > /* rdma_accept() calls rdma_reject() internally if it fails */ > - err = rdma_accept(cm_id, &conn_param); > - if (err) > + if (rdma_accept(cm_id, &conn_param)) > rds_ib_conn_error(conn, "rdma_accept failed (%d)\n", err); > There are couple of consumer reject reasons needs to be conveyed. Current code don't pass them, but downstream code has them and hence I kept the code as is. Its good to avoid the reject on current code so am fine with the change. Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index ce3775a..eca3d5f 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -677,8 +677,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id, event->param.conn.initiator_depth); /* rdma_accept() calls rdma_reject() internally if it fails */ - err = rdma_accept(cm_id, &conn_param); - if (err) + if (rdma_accept(cm_id, &conn_param)) rds_ib_conn_error(conn, "rdma_accept failed (%d)\n", err); out:
When rdma_accept fails, rdma_reject is called in it. As such, it is not necessary to execute rdma_reject again. Cc: Joe Jin <joe.jin@oracle.com> Cc: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> --- net/rds/ib_cm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)