diff options
| author | Coly Li <colyli@suse.de> | 2019-06-28 19:59:54 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-28 07:39:17 -0600 |
| commit | 249a5f6da57c28a903c75d81505d58ec8c10030d (patch) | |
| tree | 8d1b48b0a00a6075f24cb5661e1f4cde84135f6c /drivers/md/bcache/bcache.h | |
| parent | ba82c1ac1667d6efb91a268edb13fc9cdaecec9b (diff) | |
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 'drivers/md/bcache/bcache.h')
| -rw-r--r-- | drivers/md/bcache/bcache.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 73a97586a2ef..cb268d7c6cea 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -726,8 +726,6 @@ struct cache_set { #define BUCKET_HASH_BITS 12 struct hlist_head bucket_hash[1 << BUCKET_HASH_BITS]; - - DECLARE_HEAP(struct btree *, flush_btree); }; struct bbio { |