diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2019-04-29 14:57:18 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2019-05-07 16:05:09 -0400 |
| commit | 893e3c395b2b7ea224c3d954bf9ba468745253f2 (patch) | |
| tree | f1dabc2f141724b02d8b2048f7e1f76c52cf037c /drivers/md/dm-integrity.c | |
| parent | 97abfde17ae011525755f50242ed447ecebdbab5 (diff) | |
| download | blackbird-op-linux-893e3c395b2b7ea224c3d954bf9ba468745253f2.tar.gz blackbird-op-linux-893e3c395b2b7ea224c3d954bf9ba468745253f2.zip | |
dm integrity: don't report unused options
If we are not journaling, don't report journaling options in the table
status.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-integrity.c')
| -rw-r--r-- | drivers/md/dm-integrity.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 1e73422c04bc..1ff02683f6ec 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -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); - 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 { \ |
