diff options
| author | Joe Thornber <ejt@redhat.com> | 2014-11-24 14:05:16 +0000 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-12-01 11:30:09 -0500 |
| commit | 2572629a1318eb9e13e70fa59756d7bcfb80319e (patch) | |
| tree | 7162438bb121f9e4c101425d36c246ce3cb5e935 | |
| parent | 8001e87d0ee98787c46f14f5f4f97aced70f119f (diff) | |
| download | linux-2572629a1318eb9e13e70fa59756d7bcfb80319e.tar.bz2 | |
dm cache: fix some issues with the new discard range support
Commit 7ae34e777 ("dm cache: improve discard support") needed to also:
- discontinue having DM core split the discard bios on cache block
boundaries
- calculate the cache's discard_nr_blocks relative to the determined
discard_block_size rather than using oblock_to_dblock()
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
| -rw-r--r-- | drivers/md/dm-cache-target.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index abdd45d07bf6..41e7cfdb450d 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c @@ -2338,8 +2338,7 @@ static int cache_create(struct cache_args *ca, struct cache **result) ti->num_discard_bios = 1; ti->discards_supported = true; ti->discard_zeroes_data_unsupported = true; - /* Discard bios must be split on a block boundary */ - ti->split_discard_bios = true; + ti->split_discard_bios = false; cache->features = ca->features; ti->per_bio_data_size = get_per_bio_data_size(cache); @@ -2440,7 +2439,8 @@ static int cache_create(struct cache_args *ca, struct cache **result) cache->discard_block_size = calculate_discard_block_size(cache->sectors_per_block, cache->origin_sectors); - cache->discard_nr_blocks = oblock_to_dblock(cache, cache->origin_blocks); + cache->discard_nr_blocks = to_dblock(dm_sector_div_up(cache->origin_sectors, + cache->discard_block_size)); cache->discard_bitset = alloc_bitset(from_dblock(cache->discard_nr_blocks)); if (!cache->discard_bitset) { *error = "could not allocate discard bitset"; |