| Message ID | 1524655321-8379-1-git-send-email-dag.moxnes@oracle.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
> On 25 Apr 2018, at 13:22, Dag Moxnes <dag.moxnes@oracle.com> wrote: > > The function rds_ib_setup_qp is calling rds_ib_get_client_data and > should correspondingly call rds_ib_dev_put. This call was lost in > the non-error path with the introduction of error handling done in > commit 3b12f73a5c29 ("rds: ib: add error handle") > > Signed-off-by: Dag Moxnes <dag.moxnes@oracle.com> Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com> Thxs, Håkon > --- > net/rds/ib_cm.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c > index eea1d86..13b38ad 100644 > --- a/net/rds/ib_cm.c > +++ b/net/rds/ib_cm.c > @@ -547,7 +547,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) > rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd, > ic->i_send_cq, ic->i_recv_cq); > > - return ret; > + goto out; > > sends_out: > vfree(ic->i_sends); > @@ -572,6 +572,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) > ic->i_send_cq = NULL; > rds_ibdev_out: > rds_ib_remove_conn(rds_ibdev, conn); > +out: > rds_ib_dev_put(rds_ibdev); > > return ret; > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 4/25/2018 4:22 AM, Dag Moxnes wrote: > The function rds_ib_setup_qp is calling rds_ib_get_client_data and > should correspondingly call rds_ib_dev_put. This call was lost in > the non-error path with the introduction of error handling done in > commit 3b12f73a5c29 ("rds: ib: add error handle") > > Signed-off-by: Dag Moxnes <dag.moxnes@oracle.com> > --- Thanks Dag for following it up. Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Dag Moxnes <dag.moxnes@oracle.com> Date: Wed, 25 Apr 2018 13:22:01 +0200 > The function rds_ib_setup_qp is calling rds_ib_get_client_data and > should correspondingly call rds_ib_dev_put. This call was lost in > the non-error path with the introduction of error handling done in > commit 3b12f73a5c29 ("rds: ib: add error handle") > > Signed-off-by: Dag Moxnes <dag.moxnes@oracle.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index eea1d86..13b38ad 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -547,7 +547,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd, ic->i_send_cq, ic->i_recv_cq); - return ret; + goto out; sends_out: vfree(ic->i_sends); @@ -572,6 +572,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) ic->i_send_cq = NULL; rds_ibdev_out: rds_ib_remove_conn(rds_ibdev, conn); +out: rds_ib_dev_put(rds_ibdev); return ret;
The function rds_ib_setup_qp is calling rds_ib_get_client_data and should correspondingly call rds_ib_dev_put. This call was lost in the non-error path with the introduction of error handling done in commit 3b12f73a5c29 ("rds: ib: add error handle") Signed-off-by: Dag Moxnes <dag.moxnes@oracle.com> --- net/rds/ib_cm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)