lkml.org 
[lkml]   [2015]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 52/65] IB/srp: Remove an extraneous scsi_host_put() from an error path
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bart Van Assche <bart.vanassche@sandisk.com>

    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 | 13 +++++--------
    1 file changed, 5 insertions(+), 8 deletions(-)

    --- a/drivers/infiniband/ulp/srp/ib_srp.c
    +++ b/drivers/infiniband/ulp/srp/ib_srp.c
    @@ -3172,11 +3172,11 @@ static ssize_t srp_create_target(struct

    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;

    @@ -3187,7 +3187,7 @@ static ssize_t srp_create_target(struct
    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 &&
    @@ -3208,7 +3208,7 @@ static ssize_t srp_create_target(struct
    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(),
    @@ -3219,7 +3219,7 @@ static ssize_t srp_create_target(struct
    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) {
    @@ -3315,9 +3315,6 @@ err_disconnect:
    }

    kfree(target->ch);
    -
    -err:
    - scsi_host_put(target_host);
    goto out;
    }




    \
     
     \ /
      Last update: 2015-07-19 22:01    [W:4.821 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site