Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Jens Axboe <axboe@kernel.dk>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        "Ahmed S . Darwish" <a.darwish@linutronix.de>,
        Thomas Gleixner <tglx@linutronix.de>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 2/3] sr: Switch the sector size back to 2048 if sr_read_sector() changed it.
Date:   Fri,  4 Dec 2020 17:48:49 +0100
Message-Id: <20201204164850.2343359-2-bigeasy@linutronix.de>
In-Reply-To: <20201204164850.2343359-1-bigeasy@linutronix.de>
References: <20201204164803.ovwurzs3257em2rp@linutronix.de>
 <20201204164850.2343359-1-bigeasy@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

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>
---
 drivers/scsi/sr_ioctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index ffcf902da3901..5703f8400b73c 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -549,6 +549,8 @@ static int sr_read_sector(Scsi_CD *cd, int lba, int blk=
size, unsigned char *dest
 	cgc.timeout =3D IOCTL_TIMEOUT;
 	rc =3D sr_do_ioctl(cd, &cgc);
=20
+	if (blksize !=3D CD_FRAMESIZE)
+		rc |=3D sr_set_blocklength(cd, CD_FRAMESIZE);
 	return rc;
 }
=20
--=20
2.29.2