dm-integrity: change the size of the device
Mikulas Patocka
maintainerPATCH 3/3 dm-integrity: change the size of the device
If the size of the underlying device changes, we want to change the size of the integrity device too.
Signed-off-by Mikulas Patocka <[email protected]>
--- drivers/md/dm-integrity.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/md/dm-integrity.c +14 -7
@@ -2851,6 +2851,13 @@ static void dm_integrity_resume(struct dint r;DEBUG_print ("resume\n" ); +if (ic->provided_data_sectors !=le64_to_cpu (ic->sb->provided_data_sectors)) { + ic->sb->provided_data_sectors =cpu_to_le64 (ic->provided_data_sectors); + r =sync_rw_sb (ic,REQ_OP_WRITE ,REQ_FUA ); +if (unlikely (r)) +dm_integrity_io_error (ic,"writing superblock" , r); + } +if (ic->sb->flags &cpu_to_le32 (SB_FLAG_DIRTY_BITMAP )) {DEBUG_print ("resume dirty_bitmap\n" ); rw_journal_sectors(ic, REQ_OP_READ, 0, 0,
@@ -3937,16 +3944,16 @@ static int dm_integrity_ctr(struct dm_ta goto bad; } } - ic->provided_data_sectors =le64_to_cpu (ic->sb->provided_data_sectors); -if (ic->provided_data_sectors !=le64_to_cpu (ic->sb->provided_data_sectors)) { -/* test for overflow */ +if (!!(ic->sb->flags &cpu_to_le32 (SB_FLAG_HAVE_JOURNAL_MAC )) != !!ic->journal_mac_alg.alg_string) { r = -EINVAL ; - ti->error ="The superblock has 64-bit device size, but the kernel was compiled with 32-bit sectors" ; + ti->error ="Journal mac mismatch" ; goto bad; } -if (!!(ic->sb->flags &cpu_to_le32 (SB_FLAG_HAVE_JOURNAL_MAC )) != !!ic->journal_mac_alg.alg_string) { + +get_provided_data_sectors (ic); +if (!ic->provided_data_sectors) { r = -EINVAL ; - ti->error ="Journal mac mismatch" ; + ti->error ="The device is too small" ; goto bad; }
@@ -4217,7 +4224,7 @@ static void dm_integrity_dtr(struct dm_tstatic struct target_type integrity_target = { .name ="integrity" , - .version = {1 ,4 ,0 }, + .version = {1 ,5 ,0 }, .module =THIS_MODULE , .features =DM_TARGET_SINGLETON |DM_TARGET_INTEGRITY , .ctr = dm_integrity_ctr,