Skip to contentSkip to conversation

bcachefs: Fix inconsistent req->ec

PATCH In review Alan Huang 2 participants 2 messages May 3, 2025

lore
Share & tools
lore

Alan Huang

author
#0 lore raw

PATCH 1/1 bcachefs: Fix inconsistent req->ec

There is req->ec = erasure_code above.

---
 fs/bcachefs/alloc_foreground.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/bcachefs/alloc_foreground.c +3 -3
index a0f92daa44cf..c17c5733526d 100644
@@ -1255,6 +1255,9 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans,
 	if (unlikely(ret))
 		return ret;
 
+	if (!IS_ENABLED(CONFIG_BCACHEFS_ERASURE_CODING))
+		erasure_code = false;
+
 	req->nr_replicas	= nr_replicas;
 	req->target		= target;
 	req->ec			= erasure_code;
@@ -1262,9 +1265,6 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans,
 	req->flags		= flags;
 	req->devs_have		= devs_have;
 
-	if (!IS_ENABLED(CONFIG_BCACHEFS_ERASURE_CODING))
-		erasure_code = false;
-
 	BUG_ON(!nr_replicas || !nr_replicas_required);
 retry:
 	req->ptrs.nr		= 0;
Signature · 1 line
2.48.1
#1 lore raw
Quoted 3 lines · Alan Huang

There is req->ec = erasure_code above.

Thanks, I screwed this up when I was reducing stack usage in the allocator path - it was only busted in -next, fortunately.

Quoted 31 lines
---
 fs/bcachefs/alloc_foreground.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/bcachefs/alloc_foreground.c +3 -3
index a0f92daa44cf..c17c5733526d 100644
@@ -1255,6 +1255,9 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans,
 	if (unlikely(ret))
 		return ret;
 
+	if (!IS_ENABLED(CONFIG_BCACHEFS_ERASURE_CODING))
+		erasure_code = false;
+
 	req->nr_replicas	= nr_replicas;
 	req->target		= target;
 	req->ec			= erasure_code;
@@ -1262,9 +1265,6 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans,
 	req->flags		= flags;
 	req->devs_have		= devs_have;
 
-	if (!IS_ENABLED(CONFIG_BCACHEFS_ERASURE_CODING))
-		erasure_code = false;
-
 	BUG_ON(!nr_replicas || !nr_replicas_required);
 retry:
 	req->ptrs.nr		= 0;
Signature · 1 line
2.48.1