bcache: Revert "bcache: fix high CPU occupancy during journal"
authorColy Li <colyli@suse.de>
Fri, 28 Jun 2019 11:59:54 +0000 (19:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:14:21 +0000 (09:14 +0200)
commitab966241d59ab77c98ec94faea38d21946c036e4
tree5461491658004e77561af00c4eb5192dcb87b21d
parent58169c189bd66329459a982a1d0ab613e33626fc
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>
drivers/md/bcache/bcache.h
drivers/md/bcache/journal.c
drivers/md/bcache/util.h