blob: e126283fcee2e4038a0d263dbaedda0d4b23de1b [file] [log] [blame]
From 6da135b233dcf8d90ca75fb973a6aa591dedd535 Mon Sep 17 00:00:00 2001
From: Huaisheng Ye <yehs1@lenovo.com>
Date: Mon, 2 Sep 2019 18:04:50 +0800
Subject: [PATCH] dm writecache: skip writecache_wait for pmem mode
commit 6d1959138c8bdaf69f1116c86c77e6733db6ab34 upstream.
The array bio_in_progress[2] only have chance to be increased and
decreased with ssd mode. For pmem mode, they are not involved at all.
So skip writecache_wait_for_ios in writecache_flush for pmem.
Suggested-by: Doris Yu <tyu1@lenovo.com>
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Acked-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 598e5fafbeed..8507b719ca87 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -727,7 +727,8 @@ static void writecache_flush(struct dm_writecache *wc)
}
writecache_commit_flushed(wc);
- writecache_wait_for_ios(wc, WRITE);
+ if (!WC_MODE_PMEM(wc))
+ writecache_wait_for_ios(wc, WRITE);
wc->seq_count++;
pmem_assign(sb(wc)->seq_count, cpu_to_le64(wc->seq_count));
--
2.7.4