Commit c755f4af authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford

IB/rdmavt: Correct qp_priv_alloc() return value test

The current drivers return errors from this calldown
wrapped in an ERR_PTR().

The rdmavt code incorrectly tests for NULL.

The code is fixed to use IS_ERR() and change ret according
to the driver return value.

Cc: Stable <stable@vger.kernel.org> # 4.6+
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 8ae84f7c
...@@ -699,8 +699,10 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, ...@@ -699,8 +699,10 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
* initialization that is needed. * initialization that is needed.
*/ */
priv = rdi->driver_f.qp_priv_alloc(rdi, qp, gfp); priv = rdi->driver_f.qp_priv_alloc(rdi, qp, gfp);
if (!priv) if (IS_ERR(priv)) {
ret = priv;
goto bail_qp; goto bail_qp;
}
qp->priv = priv; qp->priv = priv;
qp->timeout_jiffies = qp->timeout_jiffies =
usecs_to_jiffies((4096UL * (1UL << qp->timeout)) / usecs_to_jiffies((4096UL * (1UL << qp->timeout)) /
......
...@@ -203,7 +203,9 @@ struct rvt_driver_provided { ...@@ -203,7 +203,9 @@ struct rvt_driver_provided {
/* /*
* Allocate a private queue pair data structure for driver specific * Allocate a private queue pair data structure for driver specific
* information which is opaque to rdmavt. * information which is opaque to rdmavt. Errors are returned via
* ERR_PTR(err). The driver is free to return NULL or a valid
* pointer.
*/ */
void * (*qp_priv_alloc)(struct rvt_dev_info *rdi, struct rvt_qp *qp, void * (*qp_priv_alloc)(struct rvt_dev_info *rdi, struct rvt_qp *qp,
gfp_t gfp); gfp_t gfp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment