Skip to contentSkip to conversation

bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked

PATCH Applied Alan Huang 2 participants 2 messages Jun 24, 2025

lore
Share & tools
lore

Alan Huang

author
#0 lore raw

PATCH 1/1 bcachefs: Don't unlock the trans if ret doesn't match BCH_ERR_operation_blocked

---
 fs/bcachefs/btree_update_interior.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/bcachefs/btree_update_interior.c +3 -2
index 7bf1bd6a6e92..553059b33bfd 100644
@@ -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) {
Signature · 1 line
2.48.1
#1 lore raw
Quoted 2 lines · Alan Huang

thanks! applied

Quoted 25 lines
---
 fs/bcachefs/btree_update_interior.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/bcachefs/btree_update_interior.c +3 -2
index 7bf1bd6a6e92..553059b33bfd 100644
@@ -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) {
Signature · 1 line
2.48.1