Flush the journal on suspend when using separate data and metadata device, so that the metadata device can be discarded and the table can be reloaded with a linear target pointing to the data device.
Note: we deliberately don't flush the journal when using the same device for metadata and data, so that the journal replay code is tested. Signed-off-by: Mikulas Patocka <[email protected]> --- drivers/md/dm-integrity.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: linux-2.6/drivers/md/dm-integrity.c =================================================================== --- linux-2.6.orig/drivers/md/dm-integrity.c 2018-06-29 23:14:06.750000000 +0200 +++ linux-2.6/drivers/md/dm-integrity.c 2018-06-29 23:14:06.740000000 +0200 @@ -2055,7 +2055,7 @@ static void integrity_writer(struct work 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); @@ -2290,6 +2290,8 @@ static void dm_integrity_postsuspend(str 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); } -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
