Commit b36f679c authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Drop memalloc_nofs_save() in bch2_btree_node_mem_alloc() 



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: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 42386fba

fs/bcachefs/btree_cache.c

+0 −5
Original line number Diff line number Diff line
@@ -671,9 +671,7 @@ struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_rea 
		: &bc->freed_nonpcpu;

	struct btree *b, *b2;

	u64 start_time = local_clock();

	unsigned flags;



	flags = memalloc_nofs_save();

	mutex_lock(&bc->lock);



	/*
@@ -745,8 +743,6 @@ struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_rea 
	bch2_time_stats_update(&c->times[BCH_TIME_btree_node_mem_alloc],

			       start_time);



	memalloc_nofs_restore(flags);



	int ret = bch2_trans_relock(trans);

	if (unlikely(ret)) {

		bch2_btree_node_to_freelist(c, b);
@@ -781,7 +777,6 @@ struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_rea 
	}



	mutex_unlock(&bc->lock);

	memalloc_nofs_restore(flags);

	return ERR_PTR(-BCH_ERR_ENOMEM_btree_node_mem_alloc);

}