staging/lustre/o2iblnd: leak cmid in kiblnd_dev_need_failover

cmid created by kiblnd_dev_need_failover should always be destroyed,
however it is not the case in current implementation and we will leak
cmid when this function detected a device failover.

Signed-off-by: Liang Zhen <[email protected]>
Reviewed-on: http://review.whamcloud.com/14603
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6480
Reviewed-by: Isaac Huang <[email protected]>
Reviewed-by: Andreas Dilger <[email protected]>
Signed-off-by: Oleg Drokin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index c29d2ced258ce4339f684da4e83bf57050f5f6c1..faa70f0b9b1ee8a881c3a7b516b4fc5fc0f1ae3e 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2228,13 +2228,10 @@ static int kiblnd_dev_need_failover(kib_dev_t *dev)
                return rc;
        }
 
-       if (dev->ibd_hdev->ibh_ibdev == cmid->device) {
-               /* don't need device failover */
-               rdma_destroy_id(cmid);
-               return 0;
-       }
+       rc = dev->ibd_hdev->ibh_ibdev != cmid->device; /* true for failover */
+       rdma_destroy_id(cmid);
 
-       return 1;
+       return rc;
 }
 
 int kiblnd_dev_failover(kib_dev_t *dev)