[PATCH 3/4] Remove ex-BKL lock from ioctl path; fix simultaneous record on >1 drive

[Tim Small]

Signed-off-by: Tim Small <t...@seoss.co.uk>
---
 drivers/block/paride/pcd.c | 8 +-------
 drivers/cdrom/gdrom.c      | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 3b7c9f1..61cabfd 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -248,13 +248,7 @@ static int pcd_block_ioctl(struct block_device *bdev, 
fmode_t mode,
                                unsigned cmd, unsigned long arg)
 {
        struct pcd_unit *cd = bdev->bd_disk->private_data;
-       int ret;
-
-       mutex_lock(&pcd_mutex);
-       ret = cdrom_ioctl(&cd->info, bdev, mode, cmd, arg);
-       mutex_unlock(&pcd_mutex);
-
-       return ret;
+       return cdrom_ioctl(&cd->info, bdev, mode, cmd, arg);
 }
 
 static unsigned int pcd_block_check_events(struct gendisk *disk,
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 584bc31..f01d01f 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -519,13 +519,7 @@ static unsigned int gdrom_bdops_check_events(struct 
gendisk *disk,
 static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode,
        unsigned cmd, unsigned long arg)
 {
-       int ret;
-
-       mutex_lock(&gdrom_mutex);
-       ret = cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg);
-       mutex_unlock(&gdrom_mutex);
-
-       return ret;
+       return cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg);
 }
 
 static const struct block_device_operations gdrom_bdops = {
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html