Commit 692c3f06 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: fix memalloc_nofs_restore() usage

Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent aafcf9bc
...@@ -554,7 +554,6 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c) ...@@ -554,7 +554,6 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c)
list_del_init(&b->list); list_del_init(&b->list);
mutex_unlock(&bc->lock); mutex_unlock(&bc->lock);
memalloc_nofs_restore(flags);
out: out:
b->flags = 0; b->flags = 0;
b->written = 0; b->written = 0;
...@@ -567,6 +566,7 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c) ...@@ -567,6 +566,7 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c)
bch2_time_stats_update(&c->times[BCH_TIME_btree_node_mem_alloc], bch2_time_stats_update(&c->times[BCH_TIME_btree_node_mem_alloc],
start_time); start_time);
memalloc_nofs_restore(flags);
return b; return b;
err: err:
/* Try to cannibalize another cached btree node: */ /* Try to cannibalize another cached btree node: */
...@@ -582,6 +582,7 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c) ...@@ -582,6 +582,7 @@ struct btree *bch2_btree_node_mem_alloc(struct bch_fs *c)
} }
mutex_unlock(&bc->lock); mutex_unlock(&bc->lock);
memalloc_nofs_restore(flags);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment