Patched in Tegra support.

1 files changed, 6 insertions, 17 deletions

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 328cad5617a..3921e3bb43c 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -29,7 +29,6 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
         struct linear_c *lc;
         unsigned long long tmp;
-        char dummy;
 
         if (argc != 2) {
                 ti->error = "Invalid argument count";
@@ -42,7 +41,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -ENOMEM;
         }
 
-        if (sscanf(argv[1], "%llu%c", &tmp, &dummy) != 1) {
+        if (sscanf(argv[1], "%llu", &tmp) != 1) {
                 ti->error = "dm-linear: Invalid device sector";
                 goto bad;
         }
@@ -55,7 +54,6 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         ti->num_flush_requests = 1;
         ti->num_discard_requests = 1;
-        ti->num_write_same_requests = 1;
         ti->private = lc;
         return 0;
 
@@ -88,7 +86,8 @@ static void linear_map_bio(struct dm_target *ti, struct bio *bio)
                 bio->bi_sector = linear_map_sector(ti, bio->bi_sector);
 }
 
-static int linear_map(struct dm_target *ti, struct bio *bio)
+static int linear_map(struct dm_target *ti, struct bio *bio,
+                      union map_info *map_context)
 {
         linear_map_bio(ti, bio);
 
@@ -96,7 +95,7 @@ static int linear_map(struct dm_target *ti, struct bio *bio)
 }
 
 static int linear_status(struct dm_target *ti, status_type_t type,
-                         unsigned status_flags, char *result, unsigned maxlen)
+                         char *result, unsigned int maxlen)
 {
         struct linear_c *lc = (struct linear_c *) ti->private;
 
@@ -117,17 +116,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 dm_dev *dev = lc->dev;
-        int r = 0;
-
-        /*
-         * Only pass ioctls through if the device sizes match exactly.
-         */
-        if (lc->start ||
-            ti->len != i_size_read(dev->bdev->bd_inode) >> SECTOR_SHIFT)
-                r = scsi_verify_blk_ioctl(NULL, cmd);
-
-        return r ? : __blkdev_driver_ioctl(dev->bdev, dev->mode, 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,
@@ -155,7 +144,7 @@ static int linear_iterate_devices(struct dm_target *ti,
 
 static struct target_type linear_target = {
         .name   = "linear",
-        .version = {1, 2, 0},
+        .version = {1, 1, 0},
         .module = THIS_MODULE,
         .ctr    = linear_ctr,
         .dtr    = linear_dtr,