Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893e3c39 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dm integrity: don't report unused options 



If we are not journaling, don't report journaling options in the table
status.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 97abfde1

drivers/md/dm-integrity.c

+7 −3
Original line number Diff line number Diff line
@@ -2468,10 +2468,12 @@ static void dm_integrity_status(struct dm_target *ti, status_type_t type, 
		__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 dm_target *ti, status_type_t type, 
		DMEMIT(" 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);

		if (ic->mode == 'J') {

			DMEMIT(" journal_watermark:%u", (unsigned)watermark_percentage);

			DMEMIT(" commit_time:%u", ic->autocommit_msec);

		}



#define EMIT_ALG(a, n)							\

		do {							\