1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index e2f876539743..c89cde86d400 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -162,6 +162,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         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))
@@ -251,8 +252,8 @@ static void stripe_map_range_sector(struct stripe_c *sc, sector_t sector,
                 *result += sc->chunk_size;              /* next chunk */
 }
 
-static int stripe_map_discard(struct stripe_c *sc, struct bio *bio,
-                              uint32_t target_stripe)
+static int stripe_map_range(struct stripe_c *sc, struct bio *bio,
+                            uint32_t target_stripe)
 {
         sector_t begin, end;
 
@@ -271,23 +272,23 @@ static int stripe_map_discard(struct stripe_c *sc, struct bio *bio,
         }
 }
 
-static int stripe_map(struct dm_target *ti, struct bio *bio,
-                      union map_info *map_context)
+static int stripe_map(struct dm_target *ti, struct bio *bio)
 {
         struct stripe_c *sc = ti->private;
         uint32_t stripe;
         unsigned target_request_nr;
 
         if (bio->bi_rw & REQ_FLUSH) {
-                target_request_nr = map_context->target_request_nr;
+                target_request_nr = dm_bio_get_target_request_nr(bio);
                 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)) {
-                target_request_nr = map_context->target_request_nr;
+        if (unlikely(bio->bi_rw & REQ_DISCARD) ||
+            unlikely(bio->bi_rw & REQ_WRITE_SAME)) {
+                target_request_nr = dm_bio_get_target_request_nr(bio);
                 BUG_ON(target_request_nr >= sc->stripes);
-                return stripe_map_discard(sc, bio, target_request_nr);
+                return stripe_map_range(sc, bio, target_request_nr);
         }
 
         stripe_map_sector(sc, bio->bi_sector, &stripe, &bio->bi_sector);
@@ -342,8 +343,7 @@ 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, union map_info *map_context)
+static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
 {
         unsigned i;
         char major_minor[16];