diff options
| author | Joe Thornber <ejt@redhat.com> | 2014-11-07 15:47:07 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-11-10 21:25:30 +0100 |
| commit | 1bad9bc4ee899a108499e5eac6baafff018b4d0b (patch) | |
| tree | 32eb64e78c6d68b65c29b9462bb264c3c69cdf8f /drivers/md/dm-cache-metadata.h | |
| parent | dm bio prison: introduce support for locking ranges of blocks (diff) | |
| download | linux-1bad9bc4ee899a108499e5eac6baafff018b4d0b.tar.xz linux-1bad9bc4ee899a108499e5eac6baafff018b4d0b.zip | |
dm cache: revert "remove remainder of distinct discard block size"
This reverts commit 64ab346a360a4b15c28fb8531918d4a01f4eabd9 because we
actually do want to allow the discard blocksize to be larger than the
cache blocksize. Further dm-cache discard changes will make this
possible.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-cache-metadata.h')
| -rw-r--r-- | drivers/md/dm-cache-metadata.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-cache-metadata.h b/drivers/md/dm-cache-metadata.h index 7383c90ccdb8..4ecc403be283 100644 --- a/drivers/md/dm-cache-metadata.h +++ b/drivers/md/dm-cache-metadata.h @@ -70,14 +70,14 @@ dm_cblock_t dm_cache_size(struct dm_cache_metadata *cmd); int dm_cache_discard_bitset_resize(struct dm_cache_metadata *cmd, sector_t discard_block_size, - dm_oblock_t new_nr_entries); + dm_dblock_t new_nr_entries); typedef int (*load_discard_fn)(void *context, sector_t discard_block_size, - dm_oblock_t dblock, bool discarded); + dm_dblock_t dblock, bool discarded); int dm_cache_load_discards(struct dm_cache_metadata *cmd, load_discard_fn fn, void *context); -int dm_cache_set_discard(struct dm_cache_metadata *cmd, dm_oblock_t dblock, bool discard); +int dm_cache_set_discard(struct dm_cache_metadata *cmd, dm_dblock_t dblock, bool discard); int dm_cache_remove_mapping(struct dm_cache_metadata *cmd, dm_cblock_t cblock); int dm_cache_insert_mapping(struct dm_cache_metadata *cmd, dm_cblock_t cblock, dm_oblock_t oblock); |