[PATCH] erofs-utils: lib: rename `fallthrough` to `erofs_fallthrough`
Noboru Asai
asai at sijam.com
Wed Aug 27 16:09:02 AEST 2025
In order to fix compile errors with libxxhash,
since `fallthrough` is used in xxhash.h.
Signed-off-by: Noboru Asai <asai at sijam.com>
---
include/erofs/defs.h | 4 ++--
lib/namei.c | 2 +-
lib/rebuild.c | 2 +-
lib/zmap.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/erofs/defs.h b/include/erofs/defs.h
index 0f3e754..b705149 100644
--- a/include/erofs/defs.h
+++ b/include/erofs/defs.h
@@ -370,9 +370,9 @@ unsigned long __roundup_pow_of_two(unsigned long n)
#define __erofs_unlikely(x) __builtin_expect(!!(x), 0)
#if __has_attribute(__fallthrough__)
-# define fallthrough __attribute__((__fallthrough__))
+# define erofs_fallthrough __attribute__((__fallthrough__))
#else
-# define fallthrough do {} while (0) /* fallthrough */
+# define erofs_fallthrough do {} while (0) /* fallthrough */
#endif
#ifdef __cplusplus
diff --git a/lib/namei.c b/lib/namei.c
index e0a6085..beede1e 100644
--- a/lib/namei.c
+++ b/lib/namei.c
@@ -133,7 +133,7 @@ int erofs_read_inode_from_disk(struct erofs_inode *vi)
switch (vi->i_mode & S_IFMT) {
case S_IFDIR:
vi->dot_omitted = (ifmt >> EROFS_I_DOT_OMITTED_BIT) & 1;
- fallthrough;
+ erofs_fallthrough;
case S_IFREG:
case S_IFLNK:
vi->u.i_blkaddr = le32_to_cpu(copied.i_u.startblk_lo) |
diff --git a/lib/rebuild.c b/lib/rebuild.c
index 95a8b3f..26c572e 100644
--- a/lib/rebuild.c
+++ b/lib/rebuild.c
@@ -231,7 +231,7 @@ static int erofs_rebuild_update_inode(struct erofs_sb_info *dst_sb,
case S_IFCHR:
if (erofs_inode_is_whiteout(inode))
inode->i_parent->whiteouts = true;
- fallthrough;
+ erofs_fallthrough;
case S_IFBLK:
case S_IFIFO:
case S_IFSOCK:
diff --git a/lib/zmap.c b/lib/zmap.c
index 916b0d2..7ab78c1 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -460,7 +460,7 @@ static int z_erofs_map_blocks_fo(struct erofs_inode *vi,
end = (m.lcn << lclusterbits) | m.clusterofs;
map->m_flags |= EROFS_MAP_FULL_MAPPED;
m.delta[0] = 1;
- fallthrough;
+ erofs_fallthrough;
case Z_EROFS_LCLUSTER_TYPE_NONHEAD:
/* get the corresponding first chunk */
err = z_erofs_extent_lookback(&m, m.delta[0]);
--
2.51.0
More information about the Linux-erofs
mailing list