diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-08-26 16:48:18 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-08-27 18:47:54 -0400 |
| commit | 90cbe3f3b4289abb39804bb0f7e78ad286e556fd (patch) | |
| tree | fa8d131708938a2cb50f45295a0f5d3aa0ba0bc8 /libbcachefs/btree_iter.c | |
| parent | 4b97a99fa263096297816f64e45cac85d4fa8011 (diff) | |
Update bcachefs sources to 753b29cc7989 bcachefs: opts.data_allowed should be OPT_FORMAT
Diffstat (limited to 'libbcachefs/btree_iter.c')
| -rw-r--r-- | libbcachefs/btree_iter.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c index 76f430f9..1e152c67 100644 --- a/libbcachefs/btree_iter.c +++ b/libbcachefs/btree_iter.c @@ -3271,9 +3271,10 @@ void *__bch2_trans_kmalloc(struct btree_trans *trans, size_t size, unsigned long EBUG_ON(trans->mem_bytes); EBUG_ON(trans->mem_top); EBUG_ON(new_bytes > BTREE_TRANS_MEM_MAX); - + bool lock_dropped = false; - new_mem = allocate_dropping_locks_norelock(trans, lock_dropped, kmalloc(new_bytes, _gfp)); + new_mem = allocate_dropping_locks_norelock(trans, lock_dropped, + kmalloc(new_bytes, _gfp|__GFP_NOWARN)); if (!new_mem) { new_mem = mempool_alloc(&c->btree_trans_mem_pool, GFP_KERNEL); new_bytes = BTREE_TRANS_MEM_MAX; @@ -3525,7 +3526,7 @@ got_trans: if (s->max_mem) { unsigned expected_mem_bytes = roundup_pow_of_two(s->max_mem); - trans->mem = kmalloc(expected_mem_bytes, GFP_KERNEL); + trans->mem = kmalloc(expected_mem_bytes, GFP_KERNEL|__GFP_NOWARN); if (likely(trans->mem)) trans->mem_bytes = expected_mem_bytes; } @@ -3696,6 +3697,9 @@ void bch2_btree_trans_to_text(struct printbuf *out, struct btree_trans *trans) prt_printf(out, "%i %s\n", task ? task->pid : 0, trans->fn); + if (trans->journal_replay_not_finished) + prt_printf(out, "has journal_keys ref\n"); + /* trans->paths is rcu protected vs. freeing */ guard(rcu)(); guard(printbuf_atomic)(out); |