diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2022-11-15 12:48:26 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-02 17:41:11 +0100 |
| commit | 20ad31b09e9838438d995ee37922ee0fde61d3f7 (patch) | |
| tree | 4f0aa307c161f4e6dd89ad2693abca076035b5ce | |
| parent | 5ca2110ba5e3f8fb8b548721b0db01bae6545be3 (diff) | |
| download | linux-20ad31b09e9838438d995ee37922ee0fde61d3f7.tar.gz linux-20ad31b09e9838438d995ee37922ee0fde61d3f7.tar.bz2 linux-20ad31b09e9838438d995ee37922ee0fde61d3f7.zip | |
dm integrity: flush the journal on suspend
[ Upstream commit 5e5dab5ec763d600fe0a67837dd9155bdc42f961 ]
This commit flushes the journal on suspend. It is prerequisite for the
next commit that enables activating dm integrity devices in read-only mode.
Note that we deliberately didn't flush the journal on suspend, so that the
journal replay code would be tested. However, the dm-integrity code is 5
years old now, so that journal replay is well-tested, and we can make this
change now.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/md/dm-integrity.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index d5b827086962..bfdcb40f330a 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -2575,10 +2575,6 @@ 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 (unlikely(dm_post_suspending(ic->ti)) && !ic->meta_dev) - return; - spin_lock_irq(&ic->endio_wait.lock); write_start = ic->committed_section; write_sections = ic->n_committed_sections; @@ -3085,8 +3081,7 @@ 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); + queue_work(ic->writer_wq, &ic->writer_work); drain_workqueue(ic->writer_wq); dm_integrity_flush_buffers(ic, true); } |