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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
79d9a11679
commit
d306f73079
@@ -2470,10 +2470,6 @@ static void integrity_writer(struct work_struct *w)
|
|||||||
|
|
||||||
unsigned prev_free_sectors;
|
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);
|
spin_lock_irq(&ic->endio_wait.lock);
|
||||||
write_start = ic->committed_section;
|
write_start = ic->committed_section;
|
||||||
write_sections = ic->n_committed_sections;
|
write_sections = ic->n_committed_sections;
|
||||||
@@ -2980,7 +2976,6 @@ static void dm_integrity_postsuspend(struct dm_target *ti)
|
|||||||
drain_workqueue(ic->commit_wq);
|
drain_workqueue(ic->commit_wq);
|
||||||
|
|
||||||
if (ic->mode == 'J') {
|
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);
|
drain_workqueue(ic->writer_wq);
|
||||||
dm_integrity_flush_buffers(ic, true);
|
dm_integrity_flush_buffers(ic, true);
|
||||||
|
Reference in New Issue
Block a user