diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-06 14:31:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-06 14:31:06 +0100 |
| commit | 626c75a01521adc3a71b43d49d4db3d956c41b9f (patch) | |
| tree | ccd5afb442f5c1763e051b6f4359bde25e1bb373 /drivers/md/bcache/btree.c | |
| parent | 7d89516d246691c9a82e75563294df01b768f1d6 (diff) | |
| parent | a3dfd8c06351968f2ec42feb1ae8dfab8b481225 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/md/bcache/btree.c')
| -rw-r--r-- | drivers/md/bcache/btree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 833c590806b..7d3deab11fc 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -633,7 +633,7 @@ static int bch_mca_shrink(struct shrinker *shrink, struct shrink_control *sc) return mca_can_free(c) * c->btree_pages; /* 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; |