lkml.org 
[lkml]   [2021]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 62/92] scsi: core: sysfs: Fix setting device state to SDEV_RUNNING
    Date
    From: Mike Christie <michael.christie@oracle.com>

    [ Upstream commit eb97545d6264b341b06ba7603f52ff6c0b2af6ea ]

    This fixes an issue added in commit 4edd8cd4e86d ("scsi: core: sysfs: Fix
    hang when device state is set via sysfs") where if userspace is requesting
    to set the device state to SDEV_RUNNING when the state is already
    SDEV_RUNNING, we return -EINVAL instead of count. The commmit above set ret
    to count for this case, when it should have set it to 0.

    Link: https://lore.kernel.org/r/20211120164917.4924-1-michael.christie@oracle.com
    Fixes: 4edd8cd4e86d ("scsi: core: sysfs: Fix hang when device state is set via sysfs")
    Reviewed-by: Lee Duncan <lduncan@suse.com>
    Signed-off-by: Mike Christie <michael.christie@oracle.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/scsi_sysfs.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
    index 16432d42a50aa..6faf1d6451b0c 100644
    --- a/drivers/scsi/scsi_sysfs.c
    +++ b/drivers/scsi/scsi_sysfs.c
    @@ -796,7 +796,7 @@ store_state_field(struct device *dev, struct device_attribute *attr,

    mutex_lock(&sdev->state_mutex);
    if (sdev->sdev_state == SDEV_RUNNING && state == SDEV_RUNNING) {
    - ret = count;
    + ret = 0;
    } else {
    ret = scsi_device_set_state(sdev, state);
    if (ret == 0 && state == SDEV_RUNNING)
    --
    2.33.0


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