OSDN Git Service

iser-target: Remove redundant check on the device
authorSagi Grimberg <sagig@mellanox.com>
Sun, 29 Mar 2015 12:52:17 +0000 (15:52 +0300)
committerNicholas Bellinger <nab@linux-iscsi.org>
Wed, 8 Apr 2015 06:27:56 +0000 (23:27 -0700)
In iser_connect_release there is no chance that
the iser device is set to NULL, if this happens
we have a BUG. So use BUG_ON.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/infiniband/ulp/isert/ib_isert.c

index 97cee96..357d481 100644 (file)
@@ -797,7 +797,9 @@ isert_connect_release(struct isert_conn *isert_conn)
 
        isert_dbg("conn %p\n", isert_conn);
 
-       if (device && device->use_fastreg)
+       BUG_ON(!device);
+
+       if (device->use_fastreg)
                isert_conn_free_fastreg_pool(isert_conn);
 
        isert_free_rx_descriptors(isert_conn);
@@ -814,10 +816,9 @@ isert_connect_release(struct isert_conn *isert_conn)
        if (isert_conn->login_buf)
                isert_free_login_buf(isert_conn);
 
-       kfree(isert_conn);
+       isert_device_put(device);
 
-       if (device)
-               isert_device_put(device);
+       kfree(isert_conn);
 }
 
 static void