Commit 84040895 authored Mar 27, 2019 by Martin K. Petersen Committed by Greg Kroah-Hartman Apr 03, 2019

scsi: sd: Quiesce warning if device does not report optimal I/O size



commit 1d5de5bd311be7cd54f02f7cd164f0349a75c876 upstream.

Commit a83da8a4509d ("scsi: sd: Optimal I/O size should be a multiple
of physical block size") split one conditional into several separate
statements in an effort to provide more accurate warning messages when
a device reports a nonsensical value. However, this reorganization
accidentally dropped the precondition of the reported value being
larger than zero. This lead to a warning getting emitted on devices
that do not report an optimal I/O size at all.

Remain silent if a device does not report an optimal I/O size.

Fixes: a83da8a4509d ("scsi: sd: Optimal I/O size should be a multiple of physical block size")
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: <stable@vger.kernel.org>
Reported-by: Hussam Al-Tayeb <ht990332@gmx.com>
Tested-by: Hussam Al-Tayeb <ht990332@gmx.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6c6e8cc1

drivers/scsi/sd.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2841,6 +2841,9 @@ static bool sd_validate_opt_xfer_size(struct scsi_disk *sdkp,
	unsigned int opt_xfer_bytes =		unsigned int opt_xfer_bytes =
	logical_to_bytes(sdp, sdkp->opt_xfer_blocks);		logical_to_bytes(sdp, sdkp->opt_xfer_blocks);

			if (sdkp->opt_xfer_blocks == 0)
			return false;

	if (sdkp->opt_xfer_blocks > dev_max) {		if (sdkp->opt_xfer_blocks > dev_max) {
	sd_first_printk(KERN_WARNING, sdkp,		sd_first_printk(KERN_WARNING, sdkp,
	"Optimal transfer size %u logical blocks " \		"Optimal transfer size %u logical blocks " \