[PATCH v6 11/11] [SCSI] sr: make sure ODD is in resumed state in block ioctl
From: Lin Ming <hidden>
Date: 2012-06-25 08:14:22
Also in:
linux-acpi, linux-scsi, lkml
Subsystem:
scsi subsystem, the rest · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
From: Aaron Lu <redacted> When application tries to access the ODD's block device by ioctl, make sure ODD is in an active state. Signed-off-by: Aaron Lu <redacted> Signed-off-by: Lin Ming <redacted> --- drivers/scsi/sr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 72488c2..3da0879 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c@@ -654,6 +654,13 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, void __user *argp = (void __user *)arg; int ret; + /* Make sure the ODD is not suspended */ + ret = pm_runtime_get_sync(&sdev->sdev_gendev); + if (ret < 0) { + pm_runtime_put_noidle(&sdev->sdev_gendev); + return -EACCES; + } + mutex_lock(&sr_mutex); /*
@@ -685,6 +692,8 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, out: mutex_unlock(&sr_mutex); + pm_runtime_mark_last_busy(&cd->device->sdev_gendev); + pm_runtime_put_autosuspend(&cd->device->sdev_gendev); return ret; }
--
1.7.10