summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan D. Milne <emilne@redhat.com>2020-12-07 17:10:21 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2021-01-05 23:45:51 -0500
commite5cc9002caafacbaa8dab878d17a313192c3b03b (patch)
tree4f82d2663c11682b9ea657d2ce3b7a6371613b67
parent3b01d7ea4dae907d34fa0eeb3f17bacd714c6d0c (diff)
downloadlinux-stable-e5cc9002caafacbaa8dab878d17a313192c3b03b.tar.gz
linux-stable-e5cc9002caafacbaa8dab878d17a313192c3b03b.tar.bz2
linux-stable-e5cc9002caafacbaa8dab878d17a313192c3b03b.zip
scsi: sd: Suppress spurious errors when WRITE SAME is being disabled
The block layer code will split a large zeroout request into multiple bios and if WRITE SAME is disabled because the storage device reports that it does not support it (or support the length used), we can get an error message from the block layer despite the setting of RQF_QUIET on the first request. This is because more than one request may have already been submitted. Fix this by setting RQF_QUIET when BLK_STS_TARGET is returned to fail the request early, we don't need to log a message because we did not actually submit the command to the device, and the block layer code will handle the error by submitting individual write bios. Link: https://lore.kernel.org/r/20201207221021.28243-1-emilne@redhat.com Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/sd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 679c2c025047..b766ad54e4a5 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -984,8 +984,10 @@ static blk_status_t sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
}
}
- if (sdp->no_write_same)
+ if (sdp->no_write_same) {
+ rq->rq_flags |= RQF_QUIET;
return BLK_STS_TARGET;
+ }
if (sdkp->ws16 || lba > 0xffffffff || nr_blocks > 0xffff)
return sd_setup_write_same16_cmnd(cmd, false);