Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347975
b: refs/heads/master
c: 45e621d
h: refs/heads/master
i:
  347973: fd8b950
  347971: ebc4140
  347967: d9d148d
v: v3
  • Loading branch information
Mike Snitzer authored and Alasdair G Kergon committed Dec 21, 2012
1 parent 2537b82 commit b8be081
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7de3ee57da4b717050e79c9313a9bf66ccc72519
refs/heads/master: 45e621d45e24ffc4cb2b2935e8438987b860063a
10 changes: 6 additions & 4 deletions trunk/drivers/md/dm-stripe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -283,10 +284,11 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
bio->bi_bdev = sc->stripe[target_request_nr].dev->bdev;
return DM_MAPIO_REMAPPED;
}
if (unlikely(bio->bi_rw & REQ_DISCARD)) {
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);
Expand Down

0 comments on commit b8be081

Please sign in to comment.