summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2017-11-12 17:05:17 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2018-01-30 20:40:43 -0500
commit7bbfd1396041880499097e31a738d1e93e5b2a2c (patch)
tree8e5a6cbc0dd602e97b48cc96cde4df98d0787417
parent8f111d3d1faa55058a330710304bfaef69dc6112 (diff)
bcachefs: don't return SHRINK_STOP when btree_cache_alloc_lock held
-rw-r--r--fs/bcachefs/btree_cache.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index 0be372c47686..4147545d047b 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -216,9 +216,6 @@ static unsigned long bch2_mca_scan(struct shrinker *shrink,
if (btree_shrinker_disabled(c))
return SHRINK_STOP;
- if (c->btree_cache_alloc_lock)
- return SHRINK_STOP;
-
/* Return -1 if we can't do anything right now */
if (sc->gfp_mask & __GFP_IO)
mutex_lock(&c->btree_cache_lock);
@@ -302,9 +299,6 @@ static unsigned long bch2_mca_count(struct shrinker *shrink,
if (btree_shrinker_disabled(c))
return 0;
- if (c->btree_cache_alloc_lock)
- return 0;
-
return mca_can_free(c) * btree_pages(c);
}