- To: Jeff Garzik <jgarzik@xxxxxxxxx>, Aaron Lu <aaron.lu@xxxxxxx>, Holger Macht <holger@xxxxxxxx>, Matthew Garrett <mjg@xxxxxxxxxx>, Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>, David Woodhouse <David.Woodhouse@xxxxxxxxx>, Dan Williams <dan.j.williams@xxxxxxxxx>
- Subject: [PATCH v6 11/11] [SCSI] sr: make sure ODD is in resumed state in block ioctl
- From: Lin Ming <ming.m.lin@xxxxxxxxx>
- Date: Mon, 25 Jun 2012 16:13:12 +0800
- Cc: linux-kernel@xxxxxxxxxxxxxxx, linux-pm@xxxxxxxxxxxxxxx, linux-scsi@xxxxxxxxxxxxxxx, linux-ide@xxxxxxxxxxxxxxx, linux-acpi@xxxxxxxxxxxxxxx
- In-reply-to: <1340611992-41457-1-git-send-email-ming.m.lin@intel.com>
- List-id: <linux-ide.vger.kernel.org>
From: Aaron Lu <aaron.lu@xxxxxxx>
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 <aaron.lu@xxxxxxx>
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
[Linux Filesystems]
[Linux SCSI]
[Linux RAID]
[Git]
[Kernel Newbies]
[Linux Newbie]
[Share Photos]
[Security]
[Netfilter]
[Bugtraq]
[Photo]
[Yosemite]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Samba]
[Video 4 Linux]
[Device Mapper]
[Linux Resources]