From: Kent Overstreet <kmo@daterainc.com>
Date: Mon, 30 Nov 2015 01:18:33 +0000 (-0800)
Subject: bcache: Add a cond_resched() call to gc
X-Git-Tag: v4.1.12-92~150^2~319
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=383e4f9cd1c67749b2cb231c1b33d60a47d00ec5;p=users%2Fjedix%2Flinux-maple.git

bcache: Add a cond_resched() call to gc

Orabug: 23330608

[ Upstream commit c5f1e5adf956e3ba82d204c7c141a75da9fa449a ]

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Eric Wheeler <bcache@linux.ewheeler.net>
Cc: Kent Overstreet <kmo@daterainc.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 08656518aa2812e8650b8036201bd9e5463f22a8)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 9aaa8f86b92a3..43829d9493f70 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -1741,6 +1741,7 @@ static void bch_btree_gc(struct cache_set *c)
 	do {
 		ret = btree_root(gc_root, c, &op, &writes, &stats);
 		closure_sync(&writes);
+		cond_resched();
 
 		if (ret && ret != -EAGAIN)
 			pr_warn("gc failed!");