kevin/linux
1
Fork 0
Code

bcachefs: Drop memalloc_nofs_save() in bch2_btree_node_mem_alloc()

Browse Source 
It's really not needed: the only locks used here are the btree cache
lock, which we drop for GFP_WAIT allocations, and btree node locks - but
we also drop those for GFP_WAIT allocations.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-08-19 15:11:20 -04:00
parent 42386fbaee
commit b36f679c99
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/bcachefs/btree_cache.c
View File

@ -671,9 +671,7 @@ struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_rea
: &bc->freed_nonpcpu; : &bc->freed_nonpcpu;
struct btree *b, *b2; struct btree *b, *b2;
u64 start_time = local_clock(); u64 start_time = local_clock();
unsigned flags;
flags = memalloc_nofs_save();
mutex_lock(&bc->lock); mutex_lock(&bc->lock);
/* /*
@ -745,8 +743,6 @@ out:
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);
int ret = bch2_trans_relock(trans); int ret = bch2_trans_relock(trans);
if (unlikely(ret)) { if (unlikely(ret)) {
bch2_btree_node_to_freelist(c, b); bch2_btree_node_to_freelist(c, b);
@ -781,7 +777,6 @@ err:
} }
mutex_unlock(&bc->lock); mutex_unlock(&bc->lock);
memalloc_nofs_restore(flags);
return ERR_PTR(-BCH_ERR_ENOMEM_btree_node_mem_alloc); return ERR_PTR(-BCH_ERR_ENOMEM_btree_node_mem_alloc);
} }