stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-13 11:07:46 +10:00
Code Issues Releases Wiki Activity

scsi: sr: Reinstate rotational media flag

Browse Source 
[ Upstream commit 708e2371f7 ]

Reinstate the rotational media flag for the CD-ROM driver. The flag has
been cleared since commit bd4a633b6f ("block: move the nonrot flag to
queue_limits") and this breaks some applications.

Move queue limit configuration from get_sectorsize() to
sr_revalidate_disk() and set the rotational flag.

Cc: Christoph Hellwig <hch@lst.de>
Fixes: bd4a633b6f ("block: move the nonrot flag to queue_limits")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250827113550.2614535-1-ming.lei@redhat.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ming Lei 2025-08-27 19:35:50 +08:00 committed by Greg Kroah-Hartman
parent db93635601
commit 28cd1a1938
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/sr.c
View File

@ -475,13 +475,21 @@ static blk_status_t sr_init_command(struct scsi_cmnd *SCpnt)
static int sr_revalidate_disk(struct scsi_cd *cd)
{
struct request_queue *q = cd->device->request_queue;
struct scsi_sense_hdr sshdr;
struct queue_limits lim;
int sector_size;
/* if the unit is not ready, nothing more to do */
if (scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, &sshdr))
return 0;
sr_cd_check(&cd->cdi);
return get_sectorsize(cd);
sector_size = get_sectorsize(cd);
lim = queue_limits_start_update(q);
lim.logical_block_size = sector_size;
lim.features |= BLK_FEAT_ROTATIONAL;
return queue_limits_commit_update_frozen(q, &lim);
}
static int sr_block_open(struct gendisk *disk, blk_mode_t mode)
@ -721,10 +729,8 @@ fail:
static int get_sectorsize(struct scsi_cd *cd)
{
struct request_queue *q = cd->device->request_queue;
static const u8 cmd[10] = { READ_CAPACITY };
unsigned char buffer[8] = { };
struct queue_limits lim;
int err;
int sector_size;
struct scsi_failure failure_defs[] = {
@ -795,9 +801,7 @@ static int get_sectorsize(struct scsi_cd *cd)
set_capacity(cd->disk, cd->capacity);
}
lim = queue_limits_start_update(q);
lim.logical_block_size = sector_size;
return queue_limits_commit_update_frozen(q, &lim);
return sector_size;
}
static int get_capabilities(struct scsi_cd *cd)