summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/util.h
diff options
context:
space:
mode:
authorColy Li <colyli@suse.de>2019-06-28 13:59:54 +0200
committerJens Axboe <axboe@kernel.dk>2019-06-28 15:39:17 +0200
commit249a5f6da57c28a903c75d81505d58ec8c10030d (patch)
tree8d1b48b0a00a6075f24cb5661e1f4cde84135f6c /drivers/md/bcache/util.h
parentbcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free" (diff)
downloadlinux-249a5f6da57c28a903c75d81505d58ec8c10030d.tar.xz
linux-249a5f6da57c28a903c75d81505d58ec8c10030d.zip
bcache: Revert "bcache: fix high CPU occupancy during journal"
This reverts commit c4dc2497d50d9c6fb16aa0d07b6a14f3b2adb1e0. This patch enlarges a race between normal btree flush code path and flush_btree_write(), which causes deadlock when journal space is exhausted. Reverts this patch makes the race window from 128 btree nodes to only 1 btree nodes. Fixes: c4dc2497d50d ("bcache: fix high CPU occupancy during journal") Signed-off-by: Coly Li <colyli@suse.de> Cc: stable@vger.kernel.org Cc: Tang Junhui <tang.junhui.linux@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
-rw-r--r--drivers/md/bcache/util.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
index 1fbced94e4cc..c029f7443190 100644
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@ -113,8 +113,6 @@ do { \
#define heap_full(h) ((h)->used == (h)->size)
-#define heap_empty(h) ((h)->used == 0)
-
#define DECLARE_FIFO(type, name) \
struct { \
size_t front, back, size, mask; \