From: Mikulas Patocka <mpatocka@redhat.com>
Date: Wed, 26 May 2021 19:49:03 +0000 (-0400)
Subject: dm writecache: interrupt writeback if suspended
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=77e40164cb61cda2c2ef1ed4653dc585b87748b8;p=users%2Fjedix%2Flinux-maple.git

dm writecache: interrupt writeback if suspended

If the DM device is suspended, interrupt the writeback sequence so
that there is no excessive suspend delay.

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

diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 4a7891be2f0ac..703dba6f70223 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -1846,8 +1846,9 @@ restart:
 
 		n_walked++;
 		if (unlikely(n_walked > WRITEBACK_LATENCY) &&
-		    likely(!wc->writeback_all) && likely(!dm_suspended(wc->ti))) {
-			queue_work(wc->writeback_wq, &wc->writeback_work);
+		    likely(!wc->writeback_all)) {
+			if (likely(!dm_suspended(wc->ti)))
+				queue_work(wc->writeback_wq, &wc->writeback_work);
 			break;
 		}