1 files changed, 28 insertions, 28 deletions

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 195ca7c720f5..f20bf359b84f 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2320,7 +2320,7 @@ static int pkt_open_write(struct pktcdvd_device *pd)
 /*
  * called at open time.
  */
-static int pkt_open_dev(struct pktcdvd_device *pd, int write)
+static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
 {
         int ret;
         long lba;
@@ -2332,7 +2332,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, int write)
          * so bdget() can't fail.
          */
         bdget(pd->bdev->bd_dev);
-        if ((ret = blkdev_get(pd->bdev, FMODE_READ, O_RDONLY)))
+        if ((ret = blkdev_get(pd->bdev, FMODE_READ)))
                 goto out;
 
         if ((ret = bd_claim(pd->bdev, pd)))
@@ -2381,7 +2381,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, int write)
 out_unclaim:
         bd_release(pd->bdev);
 out_putdev:
-        blkdev_put(pd->bdev);
+        blkdev_put(pd->bdev, FMODE_READ);
 out:
         return ret;
 }
@@ -2399,7 +2399,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)
 
         pkt_set_speed(pd, MAX_SPEED, MAX_SPEED);
         bd_release(pd->bdev);
-        blkdev_put(pd->bdev);
+        blkdev_put(pd->bdev, FMODE_READ);
 
         pkt_shrink_pktlist(pd);
 }
@@ -2411,7 +2411,7 @@ static struct pktcdvd_device *pkt_find_dev_from_minor(int dev_minor)
         return pkt_devs[dev_minor];
 }
 
-static int pkt_open(struct inode *inode, struct file *file)
+static int pkt_open(struct block_device *bdev, fmode_t mode)
 {
         struct pktcdvd_device *pd = NULL;
         int ret;
@@ -2419,7 +2419,7 @@ static int pkt_open(struct inode *inode, struct file *file)
         VPRINTK(DRIVER_NAME": entering open\n");
 
         mutex_lock(&ctl_mutex);
-        pd = pkt_find_dev_from_minor(iminor(inode));
+        pd = pkt_find_dev_from_minor(MINOR(bdev->bd_dev));
         if (!pd) {
                 ret = -ENODEV;
                 goto out;
@@ -2428,20 +2428,20 @@ static int pkt_open(struct inode *inode, struct file *file)
 
         pd->refcnt++;
         if (pd->refcnt > 1) {
-                if ((file->f_mode & FMODE_WRITE) &&
+                if ((mode & FMODE_WRITE) &&
                     !test_bit(PACKET_WRITABLE, &pd->flags)) {
                         ret = -EBUSY;
                         goto out_dec;
                 }
         } else {
-                ret = pkt_open_dev(pd, file->f_mode & FMODE_WRITE);
+                ret = pkt_open_dev(pd, mode & FMODE_WRITE);
                 if (ret)
                         goto out_dec;
                 /*
                  * needed here as well, since ext2 (among others) may change
                  * the blocksize at mount time
                  */
-                set_blocksize(inode->i_bdev, CD_FRAMESIZE);
+                set_blocksize(bdev, CD_FRAMESIZE);
         }
 
         mutex_unlock(&ctl_mutex);
@@ -2455,9 +2455,9 @@ out:
         return ret;
 }
 
-static int pkt_close(struct inode *inode, struct file *file)
+static int pkt_close(struct gendisk *disk, fmode_t mode)
 {
-        struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
+        struct pktcdvd_device *pd = disk->private_data;
         int ret = 0;
 
         mutex_lock(&ctl_mutex);
@@ -2765,7 +2765,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         bdev = bdget(dev);
         if (!bdev)
                 return -ENOMEM;
-        ret = blkdev_get(bdev, FMODE_READ, O_RDONLY | O_NONBLOCK);
+        ret = blkdev_get(bdev, FMODE_READ | FMODE_NDELAY);
         if (ret)
                 return ret;
 
@@ -2790,19 +2790,28 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         return 0;
 
 out_mem:
-        blkdev_put(bdev);
+        blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
         /* This is safe: open() is still holding a reference. */
         module_put(THIS_MODULE);
         return ret;
 }
 
-static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static int pkt_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg)
 {
-        struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
+        struct pktcdvd_device *pd = bdev->bd_disk->private_data;
 
-        VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
+        VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd,
+                MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev));
 
         switch (cmd) {
+        case CDROMEJECT:
+                /*
+                 * The door gets locked when the device is opened, so we
+                 * have to unlock it or else the eject command fails.
+                 */
+                if (pd->refcnt == 1)
+                        pkt_lock_door(pd, 0);
+                /* fallthru */
         /*
          * forward selected CDROM ioctls to CD-ROM, for UDF
          */
@@ -2811,16 +2820,7 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
         case CDROM_LAST_WRITTEN:
         case CDROM_SEND_PACKET:
         case SCSI_IOCTL_SEND_COMMAND:
-                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
-
-        case CDROMEJECT:
-                /*
-                 * The door gets locked when the device is opened, so we
-                 * have to unlock it or else the eject command fails.
-                 */
-                if (pd->refcnt == 1)
-                        pkt_lock_door(pd, 0);
-                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                return __blkdev_driver_ioctl(pd->bdev, mode, cmd, arg);
 
         default:
                 VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
@@ -2849,7 +2849,7 @@ static struct block_device_operations pktcdvd_ops = {
         .owner =                THIS_MODULE,
         .open =                 pkt_open,
         .release =              pkt_close,
-        .ioctl =                pkt_ioctl,
+        .locked_ioctl =         pkt_ioctl,
         .media_changed =        pkt_media_changed,
 };
 
@@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev)
         pkt_debugfs_dev_remove(pd);
         pkt_sysfs_dev_remove(pd);
 
-        blkdev_put(pd->bdev);
+        blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE);
 
         remove_proc_entry(pd->name, pkt_proc);
         DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);