From 613faef565c2614cbcc44ff130b07fdec063dbba Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 25 Jul 2019 04:34:41 +0000 Subject: [PATCH] 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 --- iscsi-scst/kernel/isert-scst/iser_rdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 2fc6d0a5f..72e169fd4 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -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); }