diff options
| author | Coly Li <colyli@suse.de> | 2019-06-28 19:59:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:14:21 +0200 |
| commit | ab966241d59ab77c98ec94faea38d21946c036e4 (patch) | |
| tree | 5461491658004e77561af00c4eb5192dcb87b21d /drivers/md/bcache/util.h | |
| parent | 58169c189bd66329459a982a1d0ab613e33626fc (diff) | |
| download | linux-stable-ab966241d59ab77c98ec94faea38d21946c036e4.tar.gz linux-stable-ab966241d59ab77c98ec94faea38d21946c036e4.tar.bz2 linux-stable-ab966241d59ab77c98ec94faea38d21946c036e4.zip | |
bcache: Revert "bcache: fix high CPU occupancy during journal"
commit 249a5f6da57c28a903c75d81505d58ec8c10030d upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/bcache/util.h')
| -rw-r--r-- | drivers/md/bcache/util.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index 00aab6abcfe4..b1f5b7aea872 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; \ |