[PATCH] dm: support ioctls on mapped devices

Extend the core device-mapper infrastructure to accept arbitrary ioctls on a
mapped device provided that it has exactly one target and it is capable of
supporting ioctls.

[We can't use unlocked_ioctl because we need 'inode': 'file' might be NULL.
Is it worth changing this?]

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

Arnd Bergmann <arnd@arndb.de> wrote:

> Am Wednesday 21 June 2006 21:31 schrieb Alasdair G Kergon:
> > static struct block_device_operations dm_blk_dops = {
> > .open = dm_blk_open,
> > .release = dm_blk_close,
> > +.ioctl = dm_blk_ioctl,
> > .getgeo = dm_blk_getgeo,
> > .owner = THIS_MODULE
>
> I guess this also needs a ->compat_ioctl method, otherwise it won't
> work for ioctl numbers that have a compat_ioctl implementation in the
> low-level device driver.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 41 insertions, 0 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c99bf9f01759..5792686936c1 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -20,6 +20,7 @@
 #include <linux/idr.h>
 #include <linux/hdreg.h>
 #include <linux/blktrace_api.h>
+#include <linux/smp_lock.h>
 
 #define DM_MSG_PREFIX "core"
 
@@ -288,6 +289,45 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return dm_get_geometry(md, geo);
 }
 
+static int dm_blk_ioctl(struct inode *inode, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        struct mapped_device *md;
+        struct dm_table *map;
+        struct dm_target *tgt;
+        int r = -ENOTTY;
+
+        /* We don't really need this lock, but we do need 'inode'. */
+        unlock_kernel();
+
+        md = inode->i_bdev->bd_disk->private_data;
+
+        map = dm_get_table(md);
+
+        if (!map || !dm_table_get_size(map))
+                goto out;
+
+        /* We only support devices that have a single target */
+        if (dm_table_get_num_targets(map) != 1)
+                goto out;
+
+        tgt = dm_table_get_target(map, 0);
+
+        if (dm_suspended(md)) {
+                r = -EAGAIN;
+                goto out;
+        }
+
+        if (tgt->type->ioctl)
+                r = tgt->type->ioctl(tgt, inode, file, cmd, arg);
+
+out:
+        dm_table_put(map);
+
+        lock_kernel();
+        return r;
+}
+
 static inline struct dm_io *alloc_io(struct mapped_device *md)
 {
         return mempool_alloc(md->io_pool, GFP_NOIO);
@@ -1377,6 +1417,7 @@ int dm_suspended(struct mapped_device *md)
 static struct block_device_operations dm_blk_dops = {
         .open = dm_blk_open,
         .release = dm_blk_close,
+        .ioctl = dm_blk_ioctl,
         .getgeo = dm_blk_getgeo,
         .owner = THIS_MODULE
 };