OSDN Git Service

IB/srp: Remove an extraneous scsi_host_put() from an error path
authorBart Van Assche <bart.vanassche@sandisk.com>
Mon, 18 May 2015 11:23:14 +0000 (13:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jul 2015 17:10:14 +0000 (10:10 -0700)
commit fb49c8bbaae70b14fea2b4590a90a21539f88526 upstream.

Fix a scsi_get_host() / scsi_host_put() imbalance in the error
path of srp_create_target(). See also patch "IB/srp: Avoid that
I/O hangs due to a cable pull during LUN scanning" (commit ID
34aa654ecb8e).

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/infiniband/ulp/srp/ib_srp.c

index 0747c05..a56d256 100644 (file)
@@ -3171,11 +3171,11 @@ static ssize_t srp_create_target(struct device *dev,
 
        ret = srp_parse_options(buf, target);
        if (ret)
-               goto err;
+               goto out;
 
        ret = scsi_init_shared_tag_map(target_host, target_host->can_queue);
        if (ret)
-               goto err;
+               goto out;
 
        target->req_ring_size = target->queue_size - SRP_TSK_MGMT_SQ_SIZE;
 
@@ -3186,7 +3186,7 @@ static ssize_t srp_create_target(struct device *dev,
                             be64_to_cpu(target->ioc_guid),
                             be64_to_cpu(target->initiator_ext));
                ret = -EEXIST;
-               goto err;
+               goto out;
        }
 
        if (!srp_dev->has_fmr && !srp_dev->has_fr && !target->allow_ext_sg &&
@@ -3207,7 +3207,7 @@ static ssize_t srp_create_target(struct device *dev,
        spin_lock_init(&target->lock);
        ret = ib_query_gid(ibdev, host->port, 0, &target->sgid);
        if (ret)
-               goto err;
+               goto out;
 
        ret = -ENOMEM;
        target->ch_count = max_t(unsigned, num_online_nodes(),
@@ -3218,7 +3218,7 @@ static ssize_t srp_create_target(struct device *dev,
        target->ch = kcalloc(target->ch_count, sizeof(*target->ch),
                             GFP_KERNEL);
        if (!target->ch)
-               goto err;
+               goto out;
 
        node_idx = 0;
        for_each_online_node(node) {
@@ -3314,9 +3314,6 @@ err_disconnect:
        }
 
        kfree(target->ch);
-
-err:
-       scsi_host_put(target_host);
        goto out;
 }