2021-08-16 09:44:56

by Christian Loehle

Subject: [PATCH] scsi: sd: Do not exit sd_spinup_disk quietly

The sd_spinup_disk function logs what is happening nicely.
Unfortunately this output stops if the media was marked removed
in the meantime. To prevent a puzzling output, add a print
for this case, too.

Signed-off-by: Christian Loehle <[email protected]>
---
drivers/scsi/sd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b8d55af763f9..7e556f5b57e0 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2180,8 +2180,10 @@ sd_spinup_disk(struct scsi_disk *sdkp)
* doesn't have any media in it, don't bother
* with any more polling.
*/
- if (media_not_present(sdkp, &sshdr))
+ if (media_not_present(sdkp, &sshdr)) {
+ sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
return;
+ }

if (the_result)
sense_valid = scsi_sense_valid(&sshdr);
--
2.32.0

Hyperstone GmbH | Line-Eid-Strasse 3 | 78467 Konstanz
Managing Directors: Dr. Jan Peter Berns.
Commercial register of local courts: Freiburg HRB381782

2021-08-17 03:16:28

by Bart Van Assche

Subject: Re: [PATCH] scsi: sd: Do not exit sd_spinup_disk quietly

On 8/16/21 2:37 AM, Christian Löhle wrote:
> The sd_spinup_disk function logs what is happening nicely.
> Unfortunately this output stops if the media was marked removed
> in the meantime. To prevent a puzzling output, add a print
> for this case, too.
>
> Signed-off-by: Christian Loehle <[email protected]>
> ---
> drivers/scsi/sd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index b8d55af763f9..7e556f5b57e0 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -2180,8 +2180,10 @@ sd_spinup_disk(struct scsi_disk *sdkp)
> * doesn't have any media in it, don't bother
> * with any more polling.
> */
> - if (media_not_present(sdkp, &sshdr))
> + if (media_not_present(sdkp, &sshdr)) {
> + sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
> return;
> + }
>
> if (the_result)
> sense_valid = scsi_sense_valid(&sshdr);
>

Reviewed-by: Bart Van Assche <[email protected]>

2021-08-18 02:40:34

by Martin K. Petersen

Subject: Re: [PATCH] scsi: sd: Do not exit sd_spinup_disk quietly

Christian,

> The sd_spinup_disk function logs what is happening nicely.
> Unfortunately this output stops if the media was marked removed in the
> meantime. To prevent a puzzling output, add a print for this case,
> too.

Applied to 5.15/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2021-08-24 04:05:40

by Martin K. Petersen

Subject: Re: [PATCH] scsi: sd: Do not exit sd_spinup_disk quietly

On Mon, 16 Aug 2021 09:37:51 +0000, Christian Löhle wrote:

> The sd_spinup_disk function logs what is happening nicely.
> Unfortunately this output stops if the media was marked removed
> in the meantime. To prevent a puzzling output, add a print
> for this case, too.
>
>
>
> [...]

Applied to 5.15/scsi-queue, thanks!

[1/1] scsi: sd: Do not exit sd_spinup_disk quietly
https://git.kernel.org/mkp/scsi/c/848ade90ba9c

--
Martin K. Petersen Oracle Linux Engineering