Skip to contentSkip to conversation

scsi: sd: Make sd_spinup_disk less noisy

PATCH Applied Heiner Kallweit 3 participants 3 messages Sep 11, 2021 – Sep 14, 2021 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: sd: Make sd_spinup_disk less noisy

For my personal taste sd_spinup_disk() is a little bit noisy after 848ade90ba9c ("scsi: sd: Do not exit sd_spinup_disk() quietly").

scsi 0:0:0:0: Direct-Access Multiple Card Reader 1.00 PQ: 0 ANSI: 0
sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] Media removed, stopped polling
sd 0:0:0:0: [sda] Media removed, stopped polling
sd 0:0:0:0: [sda] Attached SCSI removable disk
sd 0:0:0:0: [sda] Media removed, stopped polling

There's not really a benefit in printing the same message multiple times. Therefore print it only if media_present was set before.

---
 drivers/scsi/sd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/sd.c +4 -1
index cbd9999f9..af7e7b0da 100644
@@ -2124,6 +2124,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
 		retries = 0;
 
 		do {
+			bool media_was_present = sdkp->media_present;
+
 			cmd[0] = TEST_UNIT_READY;
 			memset((void *) &cmd[1], 0, 9);
 
@@ -2138,7 +2140,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
 			 * with any more polling.
 			 */
 			if (media_not_present(sdkp, &sshdr)) {
-				sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
+				if (media_was_present)
+					sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
 				return;
 			}
 
Signature · 1 line
2.33.0
#2 lore raw
In reply to Heiner Kallweit
Quoted 11 lines · Heiner Kallweit

For my personal taste sd_spinup_disk() is a little bit noisy after 848ade90ba9c ("scsi: sd: Do not exit sd_spinup_disk() quietly").

scsi 0:0:0:0: Direct-Access Multiple Card Reader 1.00 PQ: 0 ANSI: 0
sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] Media removed, stopped polling
sd 0:0:0:0: [sda] Media removed, stopped polling
sd 0:0:0:0: [sda] Attached SCSI removable disk
sd 0:0:0:0: [sda] Media removed, stopped polling

[...]

Applied to 5.15/scsi-fixes, thanks!

[1/1] scsi: sd: Make sd_spinup_disk less noisy

      https://git.kernel.org/mkp/scsi/c/4521428c4811
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering