6 files changed, 27 insertions, 48 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 0a225ccda026..4b76fca64a6f 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2011,10 +2011,9 @@ static void dasd_flush_request_queue(struct dasd_block *block)
         spin_unlock_irq(&block->request_queue_lock);
 }
 
-static int dasd_open(struct inode *inp, struct file *filp)
+static int dasd_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *disk = inp->i_bdev->bd_disk;
-        struct dasd_block *block = disk->private_data;
+        struct dasd_block *block = bdev->bd_disk->private_data;
         struct dasd_device *base = block->base;
         int rc;
 
@@ -2052,9 +2051,8 @@ unlock:
         return rc;
 }
 
-static int dasd_release(struct inode *inp, struct file *filp)
+static int dasd_release(struct gendisk *disk, fmode_t mode)
 {
-        struct gendisk *disk = inp->i_bdev->bd_disk;
         struct dasd_block *block = disk->private_data;
 
         atomic_dec(&block->open_count);
@@ -2089,8 +2087,7 @@ dasd_device_operations = {
         .owner          = THIS_MODULE,
         .open           = dasd_open,
         .release        = dasd_release,
-        .ioctl          = dasd_ioctl,
-        .compat_ioctl   = dasd_compat_ioctl,
+        .locked_ioctl   = dasd_ioctl,
         .getgeo         = dasd_getgeo,
 };
 
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index aee6565aaf98..e99d566b69cc 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -99,7 +99,7 @@ int dasd_scan_partitions(struct dasd_block *block)
         struct block_device *bdev;
 
         bdev = bdget_disk(block->gdp, 0);
-        if (!bdev || blkdev_get(bdev, FMODE_READ, 1) < 0)
+        if (!bdev || blkdev_get(bdev, FMODE_READ) < 0)
                 return -ENODEV;
         /*
          * See fs/partition/check.c:register_disk,rescan_partitions
@@ -152,7 +152,7 @@ void dasd_destroy_partitions(struct dasd_block *block)
 
         invalidate_partition(block->gdp, 0);
         /* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */
-        blkdev_put(bdev);
+        blkdev_put(bdev, FMODE_READ);
         set_capacity(block->gdp, 0);
 }
 
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 489d5fe488fb..05a14536c369 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -610,8 +610,7 @@ int dasd_scan_partitions(struct dasd_block *);
 void dasd_destroy_partitions(struct dasd_block *);
 
 /* externals in dasd_ioctl.c */
-int  dasd_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-long dasd_compat_ioctl(struct file *, unsigned int, unsigned long);
+int  dasd_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long);
 
 /* externals in dasd_proc.c */
 int dasd_proc_init(void);
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 91a64630cb0f..b82d816d9ef7 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -366,10 +366,9 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,
 }
 
 int
-dasd_ioctl(struct inode *inode, struct file *file,
+dasd_ioctl(struct block_device *bdev, fmode_t mode,
            unsigned int cmd, unsigned long arg)
 {
-        struct block_device *bdev = inode->i_bdev;
         struct dasd_block *block = bdev->bd_disk->private_data;
         void __user *argp = (void __user *)arg;
 
@@ -421,15 +420,3 @@ dasd_ioctl(struct inode *inode, struct file *file,
                 return -EINVAL;
         }
 }
-
-long
-dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-        int rval;
-
-        lock_kernel();
-        rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
-        unlock_kernel();
-
-        return (rval == -EINVAL) ? -ENOIOCTLCMD : rval;
-}
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index a7ff167d5b81..63f26a135fe5 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -31,8 +31,8 @@
 #define PRINT_WARN(x...)  printk(KERN_WARNING DCSSBLK_NAME " warning: " x)
 #define PRINT_ERR(x...)   printk(KERN_ERR DCSSBLK_NAME " error: " x)
 
-static int dcssblk_open(struct inode *inode, struct file *filp);
-static int dcssblk_release(struct inode *inode, struct file *filp);
+static int dcssblk_open(struct block_device *bdev, fmode_t mode);
+static int dcssblk_release(struct gendisk *disk, fmode_t mode);
 static int dcssblk_make_request(struct request_queue *q, struct bio *bio);
 static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
                                  void **kaddr, unsigned long *pfn);
@@ -776,32 +776,31 @@ out_buf:
 }
 
 static int
-dcssblk_open(struct inode *inode, struct file *filp)
+dcssblk_open(struct block_device *bdev, fmode_t mode)
 {
         struct dcssblk_dev_info *dev_info;
         int rc;
 
-        dev_info = inode->i_bdev->bd_disk->private_data;
+        dev_info = bdev->bd_disk->private_data;
         if (NULL == dev_info) {
                 rc = -ENODEV;
                 goto out;
         }
         atomic_inc(&dev_info->use_count);
-        inode->i_bdev->bd_block_size = 4096;
+        bdev->bd_block_size = 4096;
         rc = 0;
 out:
         return rc;
 }
 
 static int
-dcssblk_release(struct inode *inode, struct file *filp)
+dcssblk_release(struct gendisk *disk, fmode_t mode)
 {
-        struct dcssblk_dev_info *dev_info;
+        struct dcssblk_dev_info *dev_info = disk->private_data;
         struct segment_info *entry;
         int rc;
 
-        dev_info = inode->i_bdev->bd_disk->private_data;
-        if (NULL == dev_info) {
+        if (!dev_info) {
                 rc = -ENODEV;
                 goto out;
         }
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index a25b8bf54f41..023803dbb0c7 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -43,9 +43,9 @@
 /*
  * file operation structure for tape block frontend
  */
-static int tapeblock_open(struct inode *, struct file *);
-static int tapeblock_release(struct inode *, struct file *);
-static int tapeblock_ioctl(struct inode *, struct file *, unsigned int,
+static int tapeblock_open(struct block_device *, fmode_t);
+static int tapeblock_release(struct gendisk *, fmode_t);
+static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int,
                                 unsigned long);
 static int tapeblock_medium_changed(struct gendisk *);
 static int tapeblock_revalidate_disk(struct gendisk *);
@@ -54,7 +54,7 @@ static struct block_device_operations tapeblock_fops = {
         .owner           = THIS_MODULE,
         .open            = tapeblock_open,
         .release         = tapeblock_release,
-        .ioctl           = tapeblock_ioctl,
+        .locked_ioctl           = tapeblock_ioctl,
         .media_changed   = tapeblock_medium_changed,
         .revalidate_disk = tapeblock_revalidate_disk,
 };
@@ -364,13 +364,12 @@ tapeblock_medium_changed(struct gendisk *disk)
  * Block frontend tape device open function.
  */
 static int
-tapeblock_open(struct inode *inode, struct file *filp)
+tapeblock_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *        disk;
+        struct gendisk *        disk = bdev->bd_disk;
         struct tape_device *    device;
         int                     rc;
 
-        disk   = inode->i_bdev->bd_disk;
         device = tape_get_device_reference(disk->private_data);
 
         if (device->required_tapemarks) {
@@ -410,9 +409,8 @@ release:
  *       we just get the pointer here and release the reference.
  */
 static int
-tapeblock_release(struct inode *inode, struct file *filp)
+tapeblock_release(struct gendisk *disk, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
         struct tape_device *device = disk->private_data;
 
         tape_state_set(device, TS_IN_USE);
@@ -427,22 +425,21 @@ tapeblock_release(struct inode *inode, struct file *filp)
  */
 static int
 tapeblock_ioctl(
-        struct inode *          inode,
-        struct file *           file,
+        struct block_device *   bdev,
+        fmode_t                 mode,
         unsigned int            command,
         unsigned long           arg
 ) {
         int rc;
         int minor;
-        struct gendisk *disk;
+        struct gendisk *disk = bdev->bd_disk;
         struct tape_device *device;
 
         rc     = 0;
-        disk   = inode->i_bdev->bd_disk;
         BUG_ON(!disk);
         device = disk->private_data;
         BUG_ON(!device);
-        minor  = iminor(inode);
+        minor  = MINOR(bdev->bd_dev);
 
         DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);
         DBF_LH(6, "device = %d:%d\n", tapeblock_major, minor);