[PATCH] introduce __blkdev_driver_ioctl()

Analog of blkdev_driver_ioctl() with sane arguments.  For
now uses fake struct file, by the end of the series it won't
and blkdev_driver_ioctl() will become a wrapper around it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 4 insertions, 17 deletions

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index fa358385eed3..373442b1e98f 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -114,15 +114,7 @@ static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
                         unsigned long arg)
 {
         struct linear_c *lc = (struct linear_c *) ti->private;
-        struct block_device *bdev = lc->dev->bdev;
-        struct file fake_file = {};
-        struct dentry fake_dentry = {};
-
-        fake_file.f_mode = lc->dev->mode;
-        fake_file.f_path.dentry = &fake_dentry;
-        fake_dentry.d_inode = bdev->bd_inode;
-
-        return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);
+        return __blkdev_driver_ioctl(lc->dev->bdev, lc->dev->mode, cmd, arg);
 }
 
 static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index c681d5e5f45c..d85c65a46433 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1400,13 +1400,10 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 {
         struct multipath *m = (struct multipath *) ti->private;
         struct block_device *bdev = NULL;
+        fmode_t mode = 0;
         unsigned long flags;
-        struct file fake_file = {};
-        struct dentry fake_dentry = {};
         int r = 0;
 
-        fake_file.f_path.dentry = &fake_dentry;
-
         spin_lock_irqsave(&m->lock, flags);
 
         if (!m->current_pgpath)
@@ -1414,8 +1411,7 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
         if (m->current_pgpath) {
                 bdev = m->current_pgpath->path.dev->bdev;
-                fake_dentry.d_inode = bdev->bd_inode;
-                fake_file.f_mode = m->current_pgpath->path.dev->mode;
+                mode = m->current_pgpath->path.dev->mode;
         }
 
         if (m->queue_io)
@@ -1425,8 +1421,7 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
         spin_unlock_irqrestore(&m->lock, flags);
 
-        return r ? : blkdev_driver_ioctl(bdev->bd_inode, &fake_file,
-                                         bdev->bd_disk, cmd, arg);
+        return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
 }
 
 /*-----------------------------------------------------------------