1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index d47f2f80accd..d16b02423d61 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -973,7 +973,7 @@ static int cdrom_close_write(struct cdrom_device_info *cdi)
  * is in their own interest: device control becomes a lot easier
  * this way.
  */
-int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
+int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev, fmode_t mode)
 {
         int ret;
 
@@ -982,14 +982,14 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
         /* if this was a O_NONBLOCK open and we should honor the flags,
          * do a quick open without drive/disc integrity checks. */
         cdi->use_count++;
-        if ((fp->f_flags & O_NONBLOCK) && (cdi->options & CDO_USE_FFLAGS)) {
+        if ((mode & FMODE_NDELAY) && (cdi->options & CDO_USE_FFLAGS)) {
                 ret = cdi->ops->open(cdi, 1);
         } else {
                 ret = open_for_data(cdi);
                 if (ret)
                         goto err;
                 cdrom_mmc3_profile(cdi);
-                if (fp->f_mode & FMODE_WRITE) {
+                if (mode & FMODE_WRITE) {
                         ret = -EROFS;
                         if (cdrom_open_write(cdi))
                                 goto err_release;
@@ -1007,7 +1007,7 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
                         cdi->name, cdi->use_count);
         /* Do this on open.  Don't wait for mount, because they might
             not be mounting, but opening with O_NONBLOCK */
-        check_disk_change(ip->i_bdev);
+        check_disk_change(bdev);
         return 0;
 err_release:
         if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) {
@@ -1184,7 +1184,7 @@ static int check_for_audio_disc(struct cdrom_device_info * cdi,
         return 0;
 }
 
-int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
+void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode)
 {
         struct cdrom_device_ops *cdo = cdi->ops;
         int opened_for_data;
@@ -1205,7 +1205,7 @@ int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
         }
 
         opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||
-                !(fp && fp->f_flags & O_NONBLOCK);
+                !(mode & FMODE_NDELAY);
 
         /*
          * flush cache on last write release
@@ -1219,7 +1219,6 @@ int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
                     cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
                         cdo->tray_move(cdi, 1);
         }
-        return 0;
 }
 
 static int cdrom_read_mech_status(struct cdrom_device_info *cdi, 
@@ -2662,17 +2661,17 @@ static int cdrom_ioctl_audioctl(struct cdrom_device_info *cdi,
  * these days.
  * ATAPI / SCSI specific code now mainly resides in mmc_ioctl().
  */
-int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
-                struct inode *ip, unsigned int cmd, unsigned long arg)
+int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
+                fmode_t mode, unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
         int ret;
-        struct gendisk *disk = ip->i_bdev->bd_disk;
+        struct gendisk *disk = bdev->bd_disk;
 
         /*
          * Try the generic SCSI command ioctl's first.
          */
-        ret = scsi_cmd_ioctl(file, disk->queue, disk, cmd, argp);
+        ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
         if (ret != -ENOTTY)
                 return ret;
 
@@ -2696,7 +2695,7 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
         case CDROM_SELECT_DISC:
                 return cdrom_ioctl_select_disc(cdi, arg);
         case CDROMRESET:
-                return cdrom_ioctl_reset(cdi, ip->i_bdev);
+                return cdrom_ioctl_reset(cdi, bdev);
         case CDROM_LOCKDOOR:
                 return cdrom_ioctl_lock_door(cdi, arg);
         case CDROM_DEBUG: