提交 bc5519c1 编写于 作者: K Kevin Groeneveld 提交者: Martin K. Petersen

scsi: sr: Fix typo in CDROM(CLOSETRAY|EJECT) handling

Commit 2e27f576 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from
scsi_ioctl()") seems to have a typo as it is checking ret instead of cmd in
the if statement checking for CDROMCLOSETRAY and CDROMEJECT.  This changes
the behaviour of these ioctls as the cdrom_ioctl handling of these is more
restrictive than the scsi_ioctl version.

Link: https://lore.kernel.org/r/20220323002242.21157-1-kgroeneveld@lenbrook.com
Fixes: 2e27f576 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from scsi_ioctl()")
Reviewed-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NKevin Groeneveld <kgroeneveld@lenbrook.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 f16aa285
......@@ -578,7 +578,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
scsi_autopm_get_device(sdev);
if (ret != CDROMCLOSETRAY && ret != CDROMEJECT) {
if (cmd != CDROMCLOSETRAY && cmd != CDROMEJECT) {
ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);
if (ret != -ENOSYS)
goto put;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册