1 files changed, 17 insertions, 23 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 0f17009c99d..62b6633e3a9 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -471,38 +471,31 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)
         return scsi_prep_return(q, rq, ret);
 }
 
-static int sr_block_open(struct inode *inode, struct file *file)
+static int sr_block_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct scsi_cd *cd;
-        int ret = 0;
-
-        if(!(cd = scsi_cd_get(disk)))
-                return -ENXIO;
-
-        if((ret = cdrom_open(&cd->cdi, inode, file)) != 0)
-                scsi_cd_put(cd);
+        struct scsi_cd *cd = scsi_cd_get(bdev->bd_disk);
+        int ret = -ENXIO;
 
+        if (cd) {
+                ret = cdrom_open(&cd->cdi, bdev, mode);
+                if (ret)
+                        scsi_cd_put(cd);
+        }
         return ret;
 }
 
-static int sr_block_release(struct inode *inode, struct file *file)
+static int sr_block_release(struct gendisk *disk, fmode_t mode)
 {
-        int ret;
-        struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
-        ret = cdrom_release(&cd->cdi, file);
-        if(ret)
-                return ret;
-        
+        struct scsi_cd *cd = scsi_cd(disk);
+        cdrom_release(&cd->cdi, mode);
         scsi_cd_put(cd);
-
         return 0;
 }
 
-static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
+static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                           unsigned long arg)
 {
-        struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+        struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
         struct scsi_device *sdev = cd->device;
         void __user *argp = (void __user *)arg;
         int ret;
@@ -517,7 +510,7 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
                 return scsi_ioctl(sdev, cmd, argp);
         }
 
-        ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
+        ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);
         if (ret != -ENOSYS)
                 return ret;
 
@@ -527,7 +520,8 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
          * case fall through to scsi_ioctl, which will return ENDOEV again
          * if it doesn't recognise the ioctl
          */
-        ret = scsi_nonblockable_ioctl(sdev, cmd, argp, NULL);
+        ret = scsi_nonblockable_ioctl(sdev, cmd, argp,
+                                        (mode & FMODE_NDELAY_NOW) != 0);
         if (ret != -ENODEV)
                 return ret;
         return scsi_ioctl(sdev, cmd, argp);
@@ -544,7 +538,7 @@ static struct block_device_operations sr_bdops =
         .owner          = THIS_MODULE,
         .open           = sr_block_open,
         .release        = sr_block_release,
-        .ioctl          = sr_block_ioctl,
+        .locked_ioctl   = sr_block_ioctl,
         .media_changed  = sr_block_media_changed,
         /* 
          * No compat_ioctl for now because sr_block_ioctl never