Skip to content

Commit 7a6bbc2

Browse files
damien-lemoalmartinkpetersen
authored andcommitted
scsi: sd: Do not repeat the starting disk message
The SCSI disk message "Starting disk" to signal resuming of a suspended disk is printed in both sd_resume() and sd_resume_common() which results in this message being printed twice when resuming from e.g. autosuspend: $ echo 5000 > /sys/block/sda/device/power/autosuspend_delay_ms $ echo auto > /sys/block/sda/device/power/control [ 4962.438293] sd 0:0:0:0: [sda] Synchronizing SCSI cache [ 4962.501121] sd 0:0:0:0: [sda] Stopping disk $ echo on > /sys/block/sda/device/power/control [ 4972.805851] sd 0:0:0:0: [sda] Starting disk [ 4980.558806] sd 0:0:0:0: [sda] Starting disk Fix this double print by removing the call to sd_printk() from sd_resume() and moving the call to sd_printk() in sd_resume_common() earlier in the function, before the check using sd_do_start_stop(). Doing so, the message is printed once regardless if sd_resume_common() actually executes sd_start_stop_device() (i.e. SCSI device case) or not (libsas and libata managed ATA devices case). Fixes: 0c76106 ("scsi: sd: Fix TCG OPAL unlock on system resume") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Link: https://lore.kernel.org/r/20240701215326.128067-1-dlemoal@kernel.org Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 7473610 commit 7a6bbc2

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/scsi/sd.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4117,8 +4117,6 @@ static int sd_resume(struct device *dev)
41174117
{
41184118
struct scsi_disk *sdkp = dev_get_drvdata(dev);
41194119

4120-
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
4121-
41224120
if (opal_unlock_from_suspend(sdkp->opal_dev)) {
41234121
sd_printk(KERN_NOTICE, sdkp, "OPAL unlock failed\n");
41244122
return -EIO;
@@ -4135,12 +4133,13 @@ static int sd_resume_common(struct device *dev, bool runtime)
41354133
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
41364134
return 0;
41374135

4136+
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
4137+
41384138
if (!sd_do_start_stop(sdkp->device, runtime)) {
41394139
sdkp->suspended = false;
41404140
return 0;
41414141
}
41424142

4143-
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
41444143
ret = sd_start_stop_device(sdkp, 1);
41454144
if (!ret) {
41464145
sd_resume(dev);

0 commit comments

Comments
 (0)