From: Kent Overstreet Date: Fri, 5 Jun 2020 13:01:23 +0000 (-0400) Subject: bcachefs: Check gfp_flags correctly in bch2_btree_cache_scan() X-Git-Tag: v6.7-rc1~201^2~2062 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c9eef95cde9e2a11f7c84181dc1710e594dffb2;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Check gfp_flags correctly in bch2_btree_cache_scan() bch2_btree_node_mem_alloc() uses memalloc_nofs_save()/GFP_NOFS, but GFP_NOFS does include __GFP_IO - oops. We used to use GFP_NOIO, but as we're a filesystem now GFP_NOFS makes more sense now and is looser. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c index fa55bab5944e3..541a02f87b8d0 100644 --- a/fs/bcachefs/btree_cache.c +++ b/fs/bcachefs/btree_cache.c @@ -242,7 +242,7 @@ static unsigned long bch2_btree_cache_scan(struct shrinker *shrink, return SHRINK_STOP; /* Return -1 if we can't do anything right now */ - if (sc->gfp_mask & __GFP_IO) + if (sc->gfp_mask & __GFP_FS) mutex_lock(&bc->lock); else if (!mutex_trylock(&bc->lock)) return -1;