Skip to contentSkip to conversation

bcachefs: Fix assertion pop in bch2_ptr_swab()

PATCH New Kent Overstreet 1 participant 1 message Nov 11, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bcachefs: Fix assertion pop in bch2_ptr_swab()

This runs on extents that haven't yet been validated, so we don't want to assert that we have a valid entry type.

---
 fs/bcachefs/extents.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/bcachefs/extents.c +4 -1
index 38cd9335df7d..98bb680b3860 100644
@@ -1409,7 +1409,7 @@ void bch2_ptr_swab(struct bkey_s k)
 	for (entry = ptrs.start;
 	     entry < ptrs.end;
 	     entry = extent_entry_next(entry)) {
-		switch (extent_entry_type(entry)) {
+		switch (__extent_entry_type(entry)) {
 		case BCH_EXTENT_ENTRY_ptr:
 			break;
 		case BCH_EXTENT_ENTRY_crc32:
@@ -1429,6 +1429,9 @@ void bch2_ptr_swab(struct bkey_s k)
 			break;
 		case BCH_EXTENT_ENTRY_rebalance:
 			break;
+		default:
+			/* Bad entry type: will be caught by validate() */
+			return;
 		}
 	}
 }
Signature · 1 line
2.45.2