lkml.org 
[lkml]   [2023]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RESEND v2 06/11] scsi: scsi_debug: Drop scsi_debug_bus_reset() NULL pointer checks
    Date
    The checks for SCSI cmnd, SCSI device, and SCSI host are unnecessary, so
    drop them. Likewise, drop the NULL check for sdbg_host.

    The only caller is scsi_try_bus_reset() -> eh_bus_reset_handler(),
    and there those pointers cannot be NULL.

    Signed-off-by: John Garry <john.g.garry@oracle.com>
    ---
    drivers/scsi/scsi_debug.c | 26 ++++++++------------------
    1 file changed, 8 insertions(+), 18 deletions(-)

    diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
    index 6364d6f08861..749358b48335 100644
    --- a/drivers/scsi/scsi_debug.c
    +++ b/drivers/scsi/scsi_debug.c
    @@ -5412,34 +5412,24 @@ static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)

    static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
    {
    - struct sdebug_host_info *sdbg_host;
    + struct scsi_device *sdp = SCpnt->device;
    + struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(sdp->host);
    struct sdebug_dev_info *devip;
    - struct scsi_device *sdp;
    - struct Scsi_Host *hp;
    int k = 0;

    ++num_bus_resets;
    - if (!(SCpnt && SCpnt->device))
    - goto lie;
    - sdp = SCpnt->device;
    +
    if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
    sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
    - hp = sdp->host;
    - if (hp) {
    - sdbg_host = shost_to_sdebug_host(hp);
    - if (sdbg_host) {
    - list_for_each_entry(devip,
    - &sdbg_host->dev_info_list,
    - dev_list) {
    - set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
    - ++k;
    - }
    - }
    +
    + list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
    + set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
    + ++k;
    }
    +
    if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
    sdev_printk(KERN_INFO, sdp,
    "%s: %d device(s) found in host\n", __func__, k);
    -lie:
    return SUCCESS;
    }

    --
    2.35.3
    \
     
     \ /
      Last update: 2023-03-27 00:56    [W:5.038 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site