diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-28 03:44:38 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:03 -0400 |
| commit | d95dd378c207ddec7551cce2e047e6067c3c27ab (patch) | |
| tree | 559134f6a725b13cff6de65a4ddc859213247c98 /fs/bcachefs/ec.c | |
| parent | 3ebfc8fe95c5ec560d2d5c7e7bef62ebaa33a9c4 (diff) | |
| download | lwn-d95dd378c207ddec7551cce2e047e6067c3c27ab.tar.gz lwn-d95dd378c207ddec7551cce2e047e6067c3c27ab.zip | |
bcachefs: allocate_dropping_locks()
Add two new helpers for allocating memory with btree locks held: The
idea is to first try the allocation with GFP_NOWAIT|__GFP_NOWARN, then
if that fails - unlock, retry with GFP_KERNEL, and then call
trans_relock().
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/ec.c')
| -rw-r--r-- | fs/bcachefs/ec.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c index 1c35fa1fedd3..dfc0a61afa51 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -578,15 +578,8 @@ static int __ec_stripe_mem_alloc(struct bch_fs *c, size_t idx, gfp_t gfp) static int ec_stripe_mem_alloc(struct btree_trans *trans, struct btree_iter *iter) { - size_t idx = iter->pos.offset; - - if (!__ec_stripe_mem_alloc(trans->c, idx, GFP_NOWAIT|__GFP_NOWARN)) - return 0; - - bch2_trans_unlock(trans); - - return __ec_stripe_mem_alloc(trans->c, idx, GFP_KERNEL) ?: - bch2_trans_relock(trans); + return allocate_dropping_locks_errcode(trans, + __ec_stripe_mem_alloc(trans->c, iter->pos.offset, _gfp)); } /* |