dm cache: fix corruption seen when using cache > 2TB

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-cache-target.c

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 515f83e7d9abfe868a9f5b1613eb6d9e6ba5b1e3..b59615ddf6ba7a5fa8f4f6605ef4ee0688cf7dab 100644 (file)
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -251,7 +251,7 @@ struct cache {
        /*
         * Fields for converting from sectors to blocks.
         */
-       uint32_t sectors_per_block;
+       sector_t sectors_per_block;
        int sectors_per_block_shift;
 
        spinlock_t lock;
@@ -3547,11 +3547,11 @@ static void cache_status(struct dm_target *ti, status_type_t type,
 
                residency = policy_residency(cache->policy);
 
-               DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %lu ",
+               DMEMIT("%u %llu/%llu %llu %llu/%llu %u %u %u %u %u %u %lu ",
                       (unsigned)DM_CACHE_METADATA_BLOCK_SIZE,
                       (unsigned long long)(nr_blocks_metadata - nr_free_blocks_metadata),
                       (unsigned long long)nr_blocks_metadata,
-                      cache->sectors_per_block,
+                      (unsigned long long)cache->sectors_per_block,
                       (unsigned long long) from_cblock(residency),
                       (unsigned long long) from_cblock(cache->cache_size),
                       (unsigned) atomic_read(&cache->stats.read_hit),