Patched in Tegra support.

1 files changed, 51 insertions, 61 deletions

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index c89cde86d40..3d80cf0c152 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -26,12 +26,14 @@ struct stripe {
 struct stripe_c {
         uint32_t stripes;
         int stripes_shift;
+        sector_t stripes_mask;
 
         /* The size of this target / num. stripes */
         sector_t stripe_width;
 
-        uint32_t chunk_size;
-        int chunk_size_shift;
+        /* stripe chunk size */
+        uint32_t chunk_shift;
+        sector_t chunk_mask;
 
         /* Needed for handling events */
         struct dm_target *ti;
@@ -73,9 +75,8 @@ static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
                       unsigned int stripe, char **argv)
 {
         unsigned long long start;
-        char dummy;
 
-        if (sscanf(argv[1], "%llu%c", &start, &dummy) != 1)
+        if (sscanf(argv[1], "%llu", &start) != 1)
                 return -EINVAL;
 
         if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
@@ -89,7 +90,7 @@ static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
 
 /*
  * Construct a striped mapping.
- * <number of stripes> <chunk size> [<dev_path> <offset>]+
+ * <number of stripes> <chunk size (2^^n)> [<dev_path> <offset>]+
  */
 static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
@@ -97,6 +98,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         sector_t width;
         uint32_t stripes;
         uint32_t chunk_size;
+        char *end;
         int r;
         unsigned int i;
 
@@ -105,23 +107,34 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -EINVAL;
         }
 
-        if (kstrtouint(argv[0], 10, &stripes) || !stripes) {
+        stripes = simple_strtoul(argv[0], &end, 10);
+        if (!stripes || *end) {
                 ti->error = "Invalid stripe count";
                 return -EINVAL;
         }
 
-        if (kstrtouint(argv[1], 10, &chunk_size) || !chunk_size) {
+        chunk_size = simple_strtoul(argv[1], &end, 10);
+        if (*end) {
                 ti->error = "Invalid chunk_size";
                 return -EINVAL;
         }
 
-        width = ti->len;
-        if (sector_div(width, chunk_size)) {
+        /*
+         * chunk_size is a power of two
+         */
+        if (!is_power_of_2(chunk_size) ||
+            (chunk_size < (PAGE_SIZE >> SECTOR_SHIFT))) {
+                ti->error = "Invalid chunk size";
+                return -EINVAL;
+        }
+
+        if (ti->len & (chunk_size - 1)) {
                 ti->error = "Target length not divisible by "
                     "chunk size";
                 return -EINVAL;
         }
 
+        width = ti->len;
         if (sector_div(width, stripes)) {
                 ti->error = "Target length not divisible by "
                     "number of stripes";
@@ -153,22 +166,17 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (stripes & (stripes - 1))
                 sc->stripes_shift = -1;
-        else
-                sc->stripes_shift = __ffs(stripes);
-
-        r = dm_set_target_max_io_len(ti, chunk_size);
-        if (r)
-                return r;
+        else {
+                sc->stripes_shift = ffs(stripes) - 1;
+                sc->stripes_mask = ((sector_t) stripes) - 1;
+        }
 
+        ti->split_io = chunk_size;
         ti->num_flush_requests = stripes;
         ti->num_discard_requests = stripes;
-        ti->num_write_same_requests = stripes;
 
-        sc->chunk_size = chunk_size;
-        if (chunk_size & (chunk_size - 1))
-                sc->chunk_size_shift = -1;
-        else
-                sc->chunk_size_shift = __ffs(chunk_size);
+        sc->chunk_shift = ffs(chunk_size) - 1;
+        sc->chunk_mask = ((sector_t) chunk_size) - 1;
 
         /*
          * Get the stripe destinations.
@@ -200,36 +208,24 @@ static void stripe_dtr(struct dm_target *ti)
         for (i = 0; i < sc->stripes; i++)
                 dm_put_device(ti, sc->stripe[i].dev);
 
-        flush_work(&sc->trigger_event);
+        flush_work_sync(&sc->trigger_event);
         kfree(sc);
 }
 
 static void stripe_map_sector(struct stripe_c *sc, sector_t sector,
                               uint32_t *stripe, sector_t *result)
 {
-        sector_t chunk = dm_target_offset(sc->ti, sector);
-        sector_t chunk_offset;
-
-        if (sc->chunk_size_shift < 0)
-                chunk_offset = sector_div(chunk, sc->chunk_size);
-        else {
-                chunk_offset = chunk & (sc->chunk_size - 1);
-                chunk >>= sc->chunk_size_shift;
-        }
+        sector_t offset = dm_target_offset(sc->ti, sector);
+        sector_t chunk = offset >> sc->chunk_shift;
 
         if (sc->stripes_shift < 0)
                 *stripe = sector_div(chunk, sc->stripes);
         else {
-                *stripe = chunk & (sc->stripes - 1);
+                *stripe = chunk & sc->stripes_mask;
                 chunk >>= sc->stripes_shift;
         }
 
-        if (sc->chunk_size_shift < 0)
-                chunk *= sc->chunk_size;
-        else
-                chunk <<= sc->chunk_size_shift;
-
-        *result = chunk + chunk_offset;
+        *result = (chunk << sc->chunk_shift) | (offset & sc->chunk_mask);
 }
 
 static void stripe_map_range_sector(struct stripe_c *sc, sector_t sector,
@@ -240,20 +236,13 @@ static void stripe_map_range_sector(struct stripe_c *sc, sector_t sector,
         stripe_map_sector(sc, sector, &stripe, result);
         if (stripe == target_stripe)
                 return;
-
-        /* round down */
-        sector = *result;
-        if (sc->chunk_size_shift < 0)
-                *result -= sector_div(sector, sc->chunk_size);
-        else
-                *result = sector & ~(sector_t)(sc->chunk_size - 1);
-
+        *result &= ~sc->chunk_mask;                     /* round down */
         if (target_stripe < stripe)
-                *result += sc->chunk_size;              /* next chunk */
+                *result += sc->chunk_mask + 1;          /* next chunk */
 }
 
-static int stripe_map_range(struct stripe_c *sc, struct bio *bio,
-                            uint32_t target_stripe)
+static int stripe_map_discard(struct stripe_c *sc, struct bio *bio,
+                              uint32_t target_stripe)
 {
         sector_t begin, end;
 
@@ -272,23 +261,23 @@ static int stripe_map_range(struct stripe_c *sc, struct bio *bio,
         }
 }
 
-static int stripe_map(struct dm_target *ti, struct bio *bio)
+static int stripe_map(struct dm_target *ti, struct bio *bio,
+                      union map_info *map_context)
 {
         struct stripe_c *sc = ti->private;
         uint32_t stripe;
         unsigned target_request_nr;
 
         if (bio->bi_rw & REQ_FLUSH) {
-                target_request_nr = dm_bio_get_target_request_nr(bio);
+                target_request_nr = map_context->target_request_nr;
                 BUG_ON(target_request_nr >= sc->stripes);
                 bio->bi_bdev = sc->stripe[target_request_nr].dev->bdev;
                 return DM_MAPIO_REMAPPED;
         }
-        if (unlikely(bio->bi_rw & REQ_DISCARD) ||
-            unlikely(bio->bi_rw & REQ_WRITE_SAME)) {
-                target_request_nr = dm_bio_get_target_request_nr(bio);
+        if (unlikely(bio->bi_rw & REQ_DISCARD)) {
+                target_request_nr = map_context->target_request_nr;
                 BUG_ON(target_request_nr >= sc->stripes);
-                return stripe_map_range(sc, bio, target_request_nr);
+                return stripe_map_discard(sc, bio, target_request_nr);
         }
 
         stripe_map_sector(sc, bio->bi_sector, &stripe, &bio->bi_sector);
@@ -312,8 +301,8 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
  *
  */
 
-static int stripe_status(struct dm_target *ti, status_type_t type,
-                         unsigned status_flags, char *result, unsigned maxlen)
+static int stripe_status(struct dm_target *ti,
+                         status_type_t type, char *result, unsigned int maxlen)
 {
         struct stripe_c *sc = (struct stripe_c *) ti->private;
         char buffer[sc->stripes + 1];
@@ -334,7 +323,7 @@ static int stripe_status(struct dm_target *ti, status_type_t type,
 
         case STATUSTYPE_TABLE:
                 DMEMIT("%d %llu", sc->stripes,
-                        (unsigned long long)sc->chunk_size);
+                        (unsigned long long)sc->chunk_mask + 1);
                 for (i = 0; i < sc->stripes; i++)
                         DMEMIT(" %s %llu", sc->stripe[i].dev->name,
                             (unsigned long long)sc->stripe[i].physical_start);
@@ -343,7 +332,8 @@ static int stripe_status(struct dm_target *ti, status_type_t type,
         return 0;
 }
 
-static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
+static int stripe_end_io(struct dm_target *ti, struct bio *bio,
+                         int error, union map_info *map_context)
 {
         unsigned i;
         char major_minor[16];
@@ -400,7 +390,7 @@ static void stripe_io_hints(struct dm_target *ti,
                             struct queue_limits *limits)
 {
         struct stripe_c *sc = ti->private;
-        unsigned chunk_size = sc->chunk_size << SECTOR_SHIFT;
+        unsigned chunk_size = (sc->chunk_mask + 1) << 9;
 
         blk_limits_io_min(limits, chunk_size);
         blk_limits_io_opt(limits, chunk_size * sc->stripes);
@@ -428,7 +418,7 @@ static int stripe_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
 
 static struct target_type stripe_target = {
         .name   = "striped",
-        .version = {1, 5, 0},
+        .version = {1, 4, 0},
         .module = THIS_MODULE,
         .ctr    = stripe_ctr,
         .dtr    = stripe_dtr,