bcachefs: Avoid extent entry type assertions in .invalid()

Kent Overstreet · Kent Overstreet · commit 264b501f8f21 · 2024-03-17T20:53:11.000-04:00
After keys have passed bkey_ops.key_invalid we should never see invalid
extent entry types - but .key_invalid itself needs to cope with them.

Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h
@@ -108,17 +108,17 @@ static inline void extent_entry_drop(struct bkey_s k, union bch_extent_entry *en
 
 static inline bool extent_entry_is_ptr(const union bch_extent_entry *e)
 {
-	return extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;
+	return __extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;
 }
 
 static inline bool extent_entry_is_stripe_ptr(const union bch_extent_entry *e)
 {
-	return extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;
+	return __extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;
 }
 
 static inline bool extent_entry_is_crc(const union bch_extent_entry *e)
 {
-	switch (extent_entry_type(e)) {
+	switch (__extent_entry_type(e)) {
 	case BCH_EXTENT_ENTRY_crc32:
 	case BCH_EXTENT_ENTRY_crc64:
 	case BCH_EXTENT_ENTRY_crc128:

Original file line number	Diff line number	Diff line change
`@@ -108,17 +108,17 @@ static inline void extent_entry_drop(struct bkey_s k, union bch_extent_entry *en`
`108`	`108`
`109`	`109`	`static inline bool extent_entry_is_ptr(const union bch_extent_entry *e)`
`110`	`110`	`{`
`111`		`- return extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;`
	`111`	`+ return __extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`static inline bool extent_entry_is_stripe_ptr(const union bch_extent_entry *e)`
`115`	`115`	`{`
`116`		`- return extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;`
	`116`	`+ return __extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`static inline bool extent_entry_is_crc(const union bch_extent_entry *e)`
`120`	`120`	`{`
`121`		`- switch (extent_entry_type(e)) {`
	`121`	`+ switch (__extent_entry_type(e)) {`
`122`	`122`	`case BCH_EXTENT_ENTRY_crc32:`
`123`	`123`	`case BCH_EXTENT_ENTRY_crc64:`
`124`	`124`	`case BCH_EXTENT_ENTRY_crc128:`