[PATCH] dm: export blkdev_driver_ioctl

[safe/jmp/linux-2.6] / drivers / md / dm-linear.c

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index daf586c..2a6bad4 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -12,6 +12,8 @@
 #include <linux/bio.h>
 #include <linux/slab.h>
 
+#define DM_MSG_PREFIX "linear"
+
 /*
  * Linear: maps a linear range of a device.
  */
@@ -29,7 +31,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        unsigned long long tmp;
 
        if (argc != 2) {
-               ti->error = "dm-linear: Invalid argument count";
+               ti->error = "Invalid argument count";
                return -EINVAL;
        }
 
@@ -96,14 +98,25 @@ static int linear_status(struct dm_target *ti, status_type_t type,
        return 0;
 }
 
+static int linear_ioctl(struct dm_target *ti, struct inode *inode,
+                       struct file *filp, unsigned int cmd,
+                       unsigned long arg)
+{
+       struct linear_c *lc = (struct linear_c *) ti->private;
+       struct block_device *bdev = lc->dev->bdev;
+
+       return blkdev_driver_ioctl(bdev->bd_inode, filp, bdev->bd_disk, cmd, arg);
+}
+
 static struct target_type linear_target = {
        .name   = "linear",
-       .version= {1, 0, 1},
+       .version= {1, 0, 2},
        .module = THIS_MODULE,
        .ctr    = linear_ctr,
        .dtr    = linear_dtr,
        .map    = linear_map,
        .status = linear_status,
+       .ioctl  = linear_ioctl,
 };
 
 int __init dm_linear_init(void)
@@ -111,7 +124,7 @@ int __init dm_linear_init(void)
        int r = dm_register_target(&linear_target);
 
        if (r < 0)
-               DMERR("linear: register failed %d", r);
+               DMERR("register failed %d", r);
 
        return r;
 }
@@ -121,5 +134,5 @@ void dm_linear_exit(void)
        int r = dm_unregister_target(&linear_target);
 
        if (r < 0)
-               DMERR("linear: unregister failed %d", r);
+               DMERR("unregister failed %d", r);
 }