path: root/drivers/md/dm-integrity.c
diff options
authorMilan Broz <gmazyland@gmail.com>2019-05-22 13:29:44 +0200
committerMike Snitzer <snitzer@redhat.com>2019-07-09 13:46:01 -0400
commit5f1c56b34e81e2d63f345f7ad6c5c7971c3c314d (patch)
tree63a04a9b8699fe2212d6376338b7889e5a7e7431 /drivers/md/dm-integrity.c
parentdm thin metadata: check if in fail_io mode when setting needs_check (diff)
dm integrity: always set version on superblock update
The new integrity bitmap mode uses the dirty flag. The dirty flag should not be set in older superblock versions. The current code sets it unconditionally, even if the superblock was already formatted without bitmap in older system. Fix this by moving the version check to one common place and check version on every superblock write. Signed-off-by: Milan Broz <gmazyland@gmail.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-integrity.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 44e76cda087a..a2ab6a32b174 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -476,6 +476,9 @@ static int sync_rw_sb(struct dm_integrity_c *ic, int op, int op_flags)
io_loc.sector = ic->start;
io_loc.count = SB_SECTORS;
+ if (op == REQ_OP_WRITE)
+ sb_set_version(ic);
return dm_io(&io_req, 1, &io_loc, NULL);
@@ -2317,7 +2320,6 @@ static void recalc_write_super(struct dm_integrity_c *ic)
if (dm_integrity_failed(ic))
- sb_set_version(ic);
r = sync_rw_sb(ic, REQ_OP_WRITE, 0);
if (unlikely(r))
dm_integrity_io_error(ic, "writing superblock", r);