Commit 747829a8 authored Jul 03, 2018 by Mikulas Patocka Committed by Mike Snitzer Jul 27, 2018

dm integrity: flush journal on suspend when using separate metadata device

Flush the journal on suspend when using separate data and metadata devices,
so that the metadata device can be discarded and the table can be reloaded
with a linear target pointing to the data device.

NOTE: the journal is deliberately not flushed when using the same device
for metadata and data, so that the journal replay code is tested.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

parent 1f9fc0b8

drivers/md/dm-integrity.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2052,7 +2052,7 @@ static void integrity_writer(struct work_struct *w)
		unsigned prev_free_sectors;

		/* the following test is not needed, but it tests the replay code */
		if (READ_ONCE(ic->suspending))
		if (READ_ONCE(ic->suspending) && !ic->meta_dev)
		return;

		spin_lock_irq(&ic->endio_wait.lock);
		@@ -2287,6 +2287,8 @@ static void dm_integrity_postsuspend(struct dm_target *ti)
		drain_workqueue(ic->commit_wq);

		if (ic->mode == 'J') {
		if (ic->meta_dev)
		queue_work(ic->writer_wq, &ic->writer_work);
		drain_workqueue(ic->writer_wq);
		dm_integrity_flush_buffers(ic);
		}