IB/srp: Remove !ch->target tests from the reconnect code

Remove the !ch->target tests from the reconnect code. These
tests are not needed: upon entry of srp_rport_reconnect()
it is guaranteed that all ch->target pointers are non-NULL.
None of the functions srp_new_cm_id(), srp_finish_req(),
srp_create_ch_ib() nor srp_connect_ch() modifies this pointer.
srp_free_ch_ib() is never called concurrently with
srp_rport_reconnect().

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Cc: Sebastian Parschauer <sebastian.riemer@profitbricks.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index af39e68c1bbdca214a4554d3bb3bf3692f36eb8f..3c8d8b261035b263337edaee3eeb291b0bacaeeb 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1210,14 +1210,10 @@ static int srp_rport_reconnect(struct srp_rport *rport)
         */
        for (i = 0; i < target->ch_count; i++) {
                ch = &target->ch[i];
-               if (!ch->target)
-                       break;
                ret += srp_new_cm_id(ch);
        }
        for (i = 0; i < target->ch_count; i++) {
                ch = &target->ch[i];
-               if (!ch->target)
-                       break;
                for (j = 0; j < target->req_ring_size; ++j) {
                        struct srp_request *req = &ch->req_ring[j];
 
@@ -1226,8 +1222,6 @@ static int srp_rport_reconnect(struct srp_rport *rport)
        }
        for (i = 0; i < target->ch_count; i++) {
                ch = &target->ch[i];
-               if (!ch->target)
-                       break;
                /*
                 * Whether or not creating a new CM ID succeeded, create a new
                 * QP. This guarantees that all completion callback function
@@ -1244,7 +1238,7 @@ static int srp_rport_reconnect(struct srp_rport *rport)
 
        for (i = 0; i < target->ch_count; i++) {
                ch = &target->ch[i];
-               if (ret || !ch->target)
+               if (ret)
                        break;
                ret = srp_connect_ch(ch, multich);
                multich = true;