* [PATCH] bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked
@ 2025-06-24 19:10 Alan Huang
2025-06-24 20:27 ` Kent Overstreet
0 siblings, 1 reply; 2+ messages in thread
From: Alan Huang @ 2025-06-24 19:10 UTC (permalink / raw)
To: kent.overstreet; +Cc: linux-bcachefs, Alan Huang, syzbot+d540192e763531d307ff
Reported-by: syzbot+d540192e763531d307ff@syzkaller.appspotmail.com
Signed-off-by: Alan Huang <mmpgouride@gmail.com>
---
fs/bcachefs/btree_update_interior.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 7bf1bd6a6e92..553059b33bfd 100644
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1287,10 +1287,11 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
do {
ret = bch2_btree_reserve_get(trans, as, nr_nodes, target, flags, &cl);
-
+ if (!bch2_err_matches(ret, BCH_ERR_operation_blocked))
+ break;
bch2_trans_unlock(trans);
bch2_wait_on_allocator(c, &cl);
- } while (bch2_err_matches(ret, BCH_ERR_operation_blocked));
+ } while (1);
}
if (ret) {
--
2.48.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked
2025-06-24 19:10 [PATCH] bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked Alan Huang
@ 2025-06-24 20:27 ` Kent Overstreet
0 siblings, 0 replies; 2+ messages in thread
From: Kent Overstreet @ 2025-06-24 20:27 UTC (permalink / raw)
To: Alan Huang; +Cc: linux-bcachefs, syzbot+d540192e763531d307ff
On Wed, Jun 25, 2025 at 03:10:27AM +0800, Alan Huang wrote:
> Reported-by: syzbot+d540192e763531d307ff@syzkaller.appspotmail.com
> Signed-off-by: Alan Huang <mmpgouride@gmail.com>
thanks! applied
> ---
> fs/bcachefs/btree_update_interior.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
> index 7bf1bd6a6e92..553059b33bfd 100644
> --- a/fs/bcachefs/btree_update_interior.c
> +++ b/fs/bcachefs/btree_update_interior.c
> @@ -1287,10 +1287,11 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
>
> do {
> ret = bch2_btree_reserve_get(trans, as, nr_nodes, target, flags, &cl);
> -
> + if (!bch2_err_matches(ret, BCH_ERR_operation_blocked))
> + break;
> bch2_trans_unlock(trans);
> bch2_wait_on_allocator(c, &cl);
> - } while (bch2_err_matches(ret, BCH_ERR_operation_blocked));
> + } while (1);
> }
>
> if (ret) {
> --
> 2.48.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-24 20:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-24 19:10 [PATCH] bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked Alan Huang
2025-06-24 20:27 ` Kent Overstreet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox