2 files changed, 16 insertions, 2 deletions

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1772fd914fb9..261107d1457c 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -493,12 +493,18 @@ static struct cdrom_device_ops gdrom_ops = {
 
 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
 {
-        return cdrom_open(gd.cd_info, bdev, mode);
+        int ret;
+        lock_kernel();
+        ret = cdrom_open(gd.cd_info, bdev, mode);
+        unlock_kernel();
+        return ret;
 }
 
 static int gdrom_bdops_release(struct gendisk *disk, fmode_t mode)
 {
+        lock_kernel();
         cdrom_release(gd.cd_info, mode);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 16dada0627ee..56bf9f44700c 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -154,13 +154,21 @@ static const struct file_operations proc_viocd_operations = {
 static int viocd_blk_open(struct block_device *bdev, fmode_t mode)
 {
         struct disk_info *di = bdev->bd_disk->private_data;
-        return cdrom_open(&di->viocd_info, bdev, mode);
+        int ret;
+
+        lock_kernel();
+        ret = cdrom_open(&di->viocd_info, bdev, mode);
+        unlock_kernel();
+
+        return ret;
 }
 
 static int viocd_blk_release(struct gendisk *disk, fmode_t mode)
 {
         struct disk_info *di = disk->private_data;
+        lock_kernel();
         cdrom_release(&di->viocd_info, mode);
+        unlock_kernel();
         return 0;
 }