Commit 8d2ac857 authored Dec 04, 2020 by Sebastian Andrzej Siewior Committed by Jens Axboe Dec 12, 2020

sr: Switch the sector size back to 2048 if sr_read_sector() changed it.



sr_read_sector() is hardly used since v2.3.16. Its only purpose is to
check if it is a XA medium via sr_is_xa(). This check is only enabled if
the module parameter `xa_test' is enabled.

Change the sector size back to 2048 if it was changed. With this change,
there is no lazy sector size changing left.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent b5f32555

drivers/scsi/sr_ioctl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -549,6 +549,8 @@ static int sr_read_sector(Scsi_CD cd, int lba, int blksize, unsigned char dest
		cgc.timeout = IOCTL_TIMEOUT;
		rc = sr_do_ioctl(cd, &cgc);

		if (blksize != CD_FRAMESIZE)
		rc \|= sr_set_blocklength(cd, CD_FRAMESIZE);
		return rc;
		}

Admin message