On Mon, 2013-12-02 at 15:00 +0100, Jiri Kosina wrote:
> On Tue, 29 Oct 2013, Wei Yongjun wrote:
>
> > From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
> >
> > Fix to return a negative error code from the error handling
> > case instead of 0, as done elsewhere in this function.
> >
> > Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
>
> This one has been sitting in my queue for quite some time, but I'd like
> the actual infiniband maintainers to be acted upon by.
>
> Roland, please?
Hi Jiri, Wei & Co,
Apologies for missing this one earlier..
This patch has been queued with a CC' for v3.10+ stable to
target-pending/master, and will be included in the next for-v3.13 fixes
PULL request.
Thank you,
--nab
>
> > ---
> > drivers/infiniband/ulp/isert/ib_isert.c | 16 ++++++++++++----
> > 1 file changed, 12 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
> > index 6df2350..2ba71c0 100644
> > --- a/drivers/infiniband/ulp/isert/ib_isert.c
> > +++ b/drivers/infiniband/ulp/isert/ib_isert.c
> > @@ -263,21 +263,29 @@ isert_create_device_ib_res(struct isert_device *device)
> > isert_cq_event_callback,
> > (void *)&cq_desc[i],
> > ISER_MAX_RX_CQ_LEN, i);
> > - if (IS_ERR(device->dev_rx_cq[i]))
> > + if (IS_ERR(device->dev_rx_cq[i])) {
> > + ret = PTR_ERR(device->dev_rx_cq[i]);
> > + device->dev_rx_cq[i] = NULL;
> > goto out_cq;
> > + }
> >
> > device->dev_tx_cq[i] = ib_create_cq(device->ib_device,
> > isert_cq_tx_callback,
> > isert_cq_event_callback,
> > (void *)&cq_desc[i],
> > ISER_MAX_TX_CQ_LEN, i);
> > - if (IS_ERR(device->dev_tx_cq[i]))
> > + if (IS_ERR(device->dev_tx_cq[i])) {
> > + ret = PTR_ERR(device->dev_tx_cq[i]);
> > + device->dev_tx_cq[i] = NULL;
> > goto out_cq;
> > + }
> >
> > - if (ib_req_notify_cq(device->dev_rx_cq[i], IB_CQ_NEXT_COMP))
> > + ret = ib_req_notify_cq(device->dev_rx_cq[i], IB_CQ_NEXT_COMP);
> > + if (ret)
> > goto out_cq;
> >
> > - if (ib_req_notify_cq(device->dev_tx_cq[i], IB_CQ_NEXT_COMP))
> > + ret = ib_req_notify_cq(device->dev_tx_cq[i], IB_CQ_NEXT_COMP);
> > + if (ret)
> > goto out_cq;
> > }
> >
> >
>
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
