isert-scst: Port to kernel v5.3 (merge r8475 and r8482 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@8483 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-07-25 04:34:41 +00:00
parent c0db1029f4
commit 613faef565

View File

@@ -1141,7 +1141,10 @@ out:
static void isert_device_release(struct isert_device *isert_dev)
{
int err, i;
#ifndef IB_PD_HAS_LOCAL_DMA_LKEY
int err;
#endif
int i;
TRACE_ENTRY();
@@ -1162,10 +1165,7 @@ static void isert_device_release(struct isert_device *isert_dev)
cancel_work_sync(&cq_desc->cq_comp_work);
#endif
err = ib_destroy_cq(cq_desc->cq);
if (unlikely(err))
PRINT_ERROR("Failed to destroy cq, err:%d", err);
ib_destroy_cq(cq_desc->cq);
destroy_workqueue(cq_desc->cq_workqueue);
}