[PATCH] dm: export blkdev_driver_ioctl

Export blkdev_driver_ioctl for device-mapper.

If we get as far as the device-mapper ioctl handler, we know the ioctl is not
a standard block layer BLK* one, so we don't need to check for them a second
time and can call blkdev_driver_ioctl() directly.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index c58f072ccae6..2a6bad451f86 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -105,7 +105,7 @@ static int linear_ioctl(struct dm_target *ti, struct inode *inode,
         struct linear_c *lc = (struct linear_c *) ti->private;
         struct block_device *bdev = lc->dev->bdev;
 
-        return blkdev_ioctl(bdev->bd_inode, filp, cmd, arg);
+        return blkdev_driver_ioctl(bdev->bd_inode, filp, bdev->bd_disk, cmd, arg);
 }
 
 static struct target_type linear_target = {
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 14cfdb538efd..dcfbf830964c 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1290,7 +1290,8 @@ static int multipath_ioctl(struct dm_target *ti, struct inode *inode,
 
         spin_unlock_irqrestore(&m->lock, flags);
 
-        return r ? : blkdev_ioctl(bdev->bd_inode, filp, cmd, arg);
+        return r ? : blkdev_driver_ioctl(bdev->bd_inode, filp, bdev->bd_disk,
+                     cmd, arg);
 }
 
 /*-----------------------------------------------------------------