From: Kent Overstreet <kmo@daterainc.com>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-bcache@vger.kernel.org
Cc: axboe@kernel.dk, Kent Overstreet <kmo@daterainc.com>
Subject: [PATCH 09/11] bcache: Fix a shrinker deadlock
Date: Mon, 23 Sep 2013 23:17:34 -0700 [thread overview]
Message-ID: <1380003456-19938-10-git-send-email-kmo@daterainc.com> (raw)
In-Reply-To: <1380003456-19938-1-git-send-email-kmo@daterainc.com>
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: Kent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
---
drivers/md/bcache/btree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 8fad840..f42fc7e 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -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;
--
1.8.4.rc3
next prev parent reply other threads:[~2013-09-24 6:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 6:17 [PATCH] Bcache fixes - please apply Kent Overstreet
2013-09-24 6:17 ` [PATCH 01/11] block: Fix bio_copy_data() Kent Overstreet
2013-09-24 6:17 ` [PATCH 02/11] bcache: Fix a dumb journal discard bug Kent Overstreet
2013-09-24 6:17 ` [PATCH 03/11] bcache: Strip endline when writing the label through sysfs Kent Overstreet
2013-09-24 6:17 ` [PATCH 04/11] bcache: Fix for when no journal entries are found Kent Overstreet
2013-09-24 6:17 ` [PATCH 05/11] bcache: Correct printf()-style format length modifier Kent Overstreet
2013-09-24 6:17 ` [PATCH 06/11] bcache: Fix a writeback performance regression Kent Overstreet
2013-09-24 6:17 ` [PATCH 07/11] bcache: Fix a flush/fua performance bug Kent Overstreet
2013-09-24 6:17 ` [PATCH 08/11] bcache: Fix a dumb CPU spinning bug in writeback Kent Overstreet
2013-09-24 6:17 ` Kent Overstreet [this message]
2013-09-24 6:17 ` [PATCH 10/11] bcache: Fix for handling overlapping extents when reading in a btree node Kent Overstreet
2013-09-24 6:17 ` [PATCH 11/11] bcache: Fix flushes in writeback mode Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380003456-19938-10-git-send-email-kmo@daterainc.com \
--to=kmo@daterainc.com \
--cc=axboe@kernel.dk \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®