TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix *__bch2_trans_subbuf_alloc() error path

Browse Source 
Don't change buf->size on error - this would usually be a transaction
restart, but it could also be -ENOMEM - when we've exceeded the bump
allocator max).

Fixes: 247abee6ae ("bcachefs: btree_trans_subbuf")
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2025-06-19 12:25:41 -04:00
parent 434635987f
commit b2348fe6c8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/bcachefs/btree_update.c
+11 -5
View File
@@ -549,20 +549,26 @@ void *__bch2_trans_subbuf_alloc(struct btree_trans *trans,
unsigned u64s)
{
unsigned new_top = buf->u64s + u64s;
unsigned old_size = buf->size;
unsigned new_size = buf->size;
if (new_top > buf->size)
buf->size = roundup_pow_of_two(new_top);
BUG_ON(roundup_pow_of_two(new_top) > U16_MAX);
void *n = bch2_trans_kmalloc_nomemzero(trans, buf->size * sizeof(u64));
if (new_top > new_size)
new_size = roundup_pow_of_two(new_top);
void *n = bch2_trans_kmalloc_nomemzero(trans, new_size * sizeof(u64));
if (IS_ERR(n))
return n;
unsigned offset = (u64 *) n - (u64 *) trans->mem;
BUG_ON(offset > U16_MAX);
if (buf->u64s)
memcpy(n,
btree_trans_subbuf_base(trans, buf),
old_size * sizeof(u64));
buf->size * sizeof(u64));
buf->base = (u64 *) n - (u64 *) trans->mem;
buf->size = new_size;
void *p = btree_trans_subbuf_top(trans, buf);
buf->u64s = new_top;