lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 332/421] scsi: scsi_dh_alua: Check for negative result value
    Date
    From: Hannes Reinecke <hare@suse.de>

    [ Upstream commit 7e26e3ea028740f934477ec01ba586ab033c35aa ]

    scsi_execute() will now return a negative error if there was an error prior
    to command submission; evaluate that instead if checking for DRIVER_ERROR.

    [mkp: build fix]

    Link: https://lore.kernel.org/r/20210427083046.31620-6-hare@suse.de
    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/device_handler/scsi_dh_alua.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
    index efd2b4312528..41e8c9e68878 100644
    --- a/drivers/scsi/device_handler/scsi_dh_alua.c
    +++ b/drivers/scsi/device_handler/scsi_dh_alua.c
    @@ -562,12 +562,12 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
    kfree(buff);
    return SCSI_DH_OK;
    }
    - if (!scsi_sense_valid(&sense_hdr)) {
    + if (retval < 0 || !scsi_sense_valid(&sense_hdr)) {
    sdev_printk(KERN_INFO, sdev,
    "%s: rtpg failed, result %d\n",
    ALUA_DH_NAME, retval);
    kfree(buff);
    - if (driver_byte(retval) == DRIVER_ERROR)
    + if (retval < 0)
    return SCSI_DH_DEV_TEMP_BUSY;
    return SCSI_DH_IO;
    }
    @@ -789,11 +789,11 @@ static unsigned alua_stpg(struct scsi_device *sdev, struct alua_port_group *pg)
    retval = submit_stpg(sdev, pg->group_id, &sense_hdr);

    if (retval) {
    - if (!scsi_sense_valid(&sense_hdr)) {
    + if (retval < 0 || !scsi_sense_valid(&sense_hdr)) {
    sdev_printk(KERN_INFO, sdev,
    "%s: stpg failed, result %d",
    ALUA_DH_NAME, retval);
    - if (driver_byte(retval) == DRIVER_ERROR)
    + if (retval < 0)
    return SCSI_DH_DEV_TEMP_BUSY;
    } else {
    sdev_printk(KERN_INFO, sdev, "%s: stpg failed\n",
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:11    [W:2.124 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site