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 4a7891be2f0ac060bf20fc2c09ba2c611c1fbe40..703dba6f70223ae891c488cde2c1ce34e0a3c428 100644 (file)
--- 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;
                }