dm-integrity: dont report unused options
Mikulas Patocka
maintainerPATCH 2/10 dm-integrity: dont report unused options
If we are not journaling, don't report journaling options in the table status.
Signed-off-by Mikulas Patocka <[email protected]>
--- drivers/md/dm-integrity.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/md/dm-integrity.c +7 -3
@@ -2468,10 +2468,12 @@ static void dm_integrity_status(struct d__u64 watermark_percentage = (__u64)(ic->journal_entries - ic->free_sectors_threshold) *100 ; watermark_percentage += ic->journal_entries /2 ;do_div (watermark_percentage, ic->journal_entries); - arg_count =5 ; + arg_count =3 ; arg_count += !!ic->meta_dev; arg_count += ic->sectors_per_block !=1 ; arg_count += !!(ic->sb->flags &cpu_to_le32 (SB_FLAG_RECALCULATING )); + arg_count += ic->mode =='J' ; + arg_count += ic->mode =='J' ; arg_count += !!ic->internal_hash_alg.alg_string; arg_count += !!ic->journal_crypt_alg.alg_string; arg_count += !!ic->journal_mac_alg.alg_string;
@@ -2486,8 +2488,10 @@ static void dm_integrity_status(struct dDMEMIT (" journal_sectors:%u" , ic->initial_sectors -SB_SECTORS );DMEMIT (" interleave_sectors:%u" ,1U << ic->sb->log2_interleave_sectors);DMEMIT (" buffer_sectors:%u" ,1U << ic->log2_buffer_sectors); -DMEMIT (" journal_watermark:%u" , (unsigned )watermark_percentage); -DMEMIT (" commit_time:%u" , ic->autocommit_msec); +if (ic->mode =='J' ) { +DMEMIT (" journal_watermark:%u" , (unsigned )watermark_percentage); +DMEMIT (" commit_time:%u" , ic->autocommit_msec); + }#define EMIT_ALG (a, n) \ do { \