Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a698e08c authored by Kent Overstreet's avatar Kent Overstreet Committed by Linus Torvalds
Browse files

bcache: Fix a shrinker deadlock 



GFP_NOIO means we could be getting called recursively - mca_alloc() ->
mca_data_alloc() - definitely can't use mutex_lock(bucket_lock) then.
Whoops.

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 79e3dab9

drivers/md/bcache/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static unsigned long bch_mca_scan(struct shrinker *shrink, 
		return SHRINK_STOP;



	/* Return -1 if we can't do anything right now */

	if (sc->gfp_mask & __GFP_WAIT)

	if (sc->gfp_mask & __GFP_IO)

		mutex_lock(&c->bucket_lock);

	else if (!mutex_trylock(&c->bucket_lock))

		return -1;