From 3e35be432c57957227dc595db92dc47947cca785 Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Tue, 3 Oct 2006 01:15:18 -0700
Subject: [PATCH] --- yaml --- r: 38081 b: refs/heads/master c:
 ab17ffa440cb54ca64111fa4922ba12496fcc8af h: refs/heads/master i:   38079:
 e5482c7c11ed96604ffe71c2c00565519e5428c1 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/md/dm-linear.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d8ce17c177f..6c8996e8905a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa129a2247b164173d45da8ad43cca5de9211403
+refs/heads/master: ab17ffa440cb54ca64111fa4922ba12496fcc8af
diff --git a/trunk/drivers/md/dm-linear.c b/trunk/drivers/md/dm-linear.c
index 47b3c62bbdb8..c58f072ccae6 100644
--- a/trunk/drivers/md/dm-linear.c
+++ b/trunk/drivers/md/dm-linear.c
@@ -98,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_ioctl(bdev->bd_inode, filp, 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)