Patched in Tegra support.

1 files changed, 11 insertions, 26 deletions

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 9721f2ffb1a..f84c08029b2 100644
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -39,10 +39,6 @@ enum feature_flag_bits {
         DROP_WRITES
 };
 
-struct per_bio_data {
-        bool bio_submitted;
-};
-
 static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
                           struct dm_target *ti)
 {
@@ -164,7 +160,6 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         unsigned long long tmpll;
         struct dm_arg_set as;
         const char *devname;
-        char dummy;
 
         as.argc = argc;
         as.argv = argv;
@@ -183,7 +178,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         devname = dm_shift_arg(&as);
 
-        if (sscanf(dm_shift_arg(&as), "%llu%c", &tmpll, &dummy) != 1) {
+        if (sscanf(dm_shift_arg(&as), "%llu", &tmpll) != 1) {
                 ti->error = "Invalid device sector";
                 goto bad;
         }
@@ -218,7 +213,6 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         ti->num_flush_requests = 1;
         ti->num_discard_requests = 1;
-        ti->per_bio_data_size = sizeof(struct per_bio_data);
         ti->private = fc;
         return 0;
 
@@ -270,12 +264,11 @@ static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc)
         }
 }
 
-static int flakey_map(struct dm_target *ti, struct bio *bio)
+static int flakey_map(struct dm_target *ti, struct bio *bio,
+                      union map_info *map_context)
 {
         struct flakey_c *fc = ti->private;
         unsigned elapsed;
-        struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data));
-        pb->bio_submitted = false;
 
         /* Are we alive ? */
         elapsed = (jiffies - fc->start_time) / HZ;
@@ -283,7 +276,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)
                 /*
                  * Flag this bio as submitted while down.
                  */
-                pb->bio_submitted = true;
+                map_context->ll = 1;
 
                 /*
                  * Map reads as normal.
@@ -320,16 +313,17 @@ map_bio:
         return DM_MAPIO_REMAPPED;
 }
 
-static int flakey_end_io(struct dm_target *ti, struct bio *bio, int error)
+static int flakey_end_io(struct dm_target *ti, struct bio *bio,
+                         int error, union map_info *map_context)
 {
         struct flakey_c *fc = ti->private;
-        struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data));
+        unsigned bio_submitted_while_down = map_context->ll;
 
         /*
          * Corrupt successful READs while in down state.
          * If flags were specified, only corrupt those that match.
          */
-        if (fc->corrupt_bio_byte && !error && pb->bio_submitted &&
+        if (!error && bio_submitted_while_down &&
             (bio_data_dir(bio) == READ) && (fc->corrupt_bio_rw == READ) &&
             all_corrupt_bio_flags_match(bio, fc))
                 corrupt_bio_data(bio, fc);
@@ -338,7 +332,7 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, int error)
 }
 
 static int flakey_status(struct dm_target *ti, status_type_t type,
-                         unsigned status_flags, char *result, unsigned maxlen)
+                         char *result, unsigned int maxlen)
 {
         unsigned sz = 0;
         struct flakey_c *fc = ti->private;
@@ -374,17 +368,8 @@ static int flakey_status(struct dm_target *ti, status_type_t type,
 static int flakey_ioctl(struct dm_target *ti, unsigned int cmd, unsigned long arg)
 {
         struct flakey_c *fc = ti->private;
-        struct dm_dev *dev = fc->dev;
-        int r = 0;
-
-        /*
-         * Only pass ioctls through if the device sizes match exactly.
-         */
-        if (fc->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(fc->dev->bdev, fc->dev->mode, cmd, arg);
 }
 
 static int flakey_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
@@ -411,7 +396,7 @@ static int flakey_iterate_devices(struct dm_target *ti, iterate_devices_callout_
 
 static struct target_type flakey_target = {
         .name   = "flakey",
-        .version = {1, 3, 0},
+        .version = {1, 2, 0},
         .module = THIS_MODULE,
         .ctr    = flakey_ctr,
         .dtr    = flakey_dtr,