From: Mikulas Patocka Subject: [PATCH 8/9] dm-integrity: flush journal on suspend when using separate device Date: Wed, 06 Jun 2018 17:33:15 +0200 Message-ID: <20180606153439.412876131@debian.vm> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline; filename=dm-integrity-flush-on-suspend.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: Mike Snitzer , Milan Broz Cc: dm-devel@redhat.com, Mikulas Patocka List-Id: dm-devel.ids 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 --- 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-06 17:09:08.000000000 +0200 +++ linux-2.6/drivers/md/dm-integrity.c 2018-06-06 17:09:08.000000000 +0200 @@ -2051,7 +2051,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); @@ -2286,6 +2286,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); }