Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7854de57 authored by Mike Christie's avatar Mike Christie Committed by Greg Kroah-Hartman
Browse files

scsi: core: sysfs: Fix setting device state to SDEV_RUNNING 

[ 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: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 67a6f64a

drivers/scsi/scsi_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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)