Commit 53004ee7 authored Apr 20, 2021 by Gustavo A. R. Silva

xfs: Fix fall-through warnings for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix
the following warnings by replacing /* fall through */ comments,
and its variants, with the new pseudo-keyword macro fallthrough:

fs/xfs/libxfs/xfs_alloc.c:3167:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/libxfs/xfs_da_btree.c:286:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/libxfs/xfs_ag_resv.c:346:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/libxfs/xfs_ag_resv.c:388:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_bmap_util.c:246:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_export.c:88:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_export.c:96:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_file.c:867:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_ioctl.c:562:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_ioctl.c:1548:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_iomap.c:1040:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_inode.c:852:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_log.c:2627:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/xfs_trans_buf.c:298:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/bmap.c:275:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/btree.c:48:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/common.c:85:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/common.c:138:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/common.c:698:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/dabtree.c:51:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/repair.c:951:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
fs/xfs/scrub/agheader.c:89:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]

Notice that Clang doesn't recognize /* fall through */ comments as
implicit fall-through markings, so in order to globally enable
-Wimplicit-fallthrough for Clang, these comments need to be
replaced with fallthrough; in the whole codebase.

Link: https://github.com/KSPP/linux/issues/115

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>

parent 135436a7

fs/xfs/libxfs/xfs_ag_resv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ xfs_ag_resv_alloc_extent(
		break;
		default:
		ASSERT(0);
		/* fall through */
		fallthrough;
		case XFS_AG_RESV_NONE:
		field = args->wasdel ? XFS_TRANS_SB_RES_FDBLOCKS :
		XFS_TRANS_SB_FDBLOCKS;
		@@ -396,7 +396,7 @@ xfs_ag_resv_free_extent(
		break;
		default:
		ASSERT(0);
		/* fall through */
		fallthrough;
		case XFS_AG_RESV_NONE:
		xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (int64_t)len);
		return;

fs/xfs/libxfs/xfs_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3174,7 +3174,7 @@ xfs_alloc_vextent(
		}
		args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);
		args->type = XFS_ALLOCTYPE_NEAR_BNO;
		/* FALLTHROUGH */
		fallthrough;
		case XFS_ALLOCTYPE_FIRST_AG:
		/*
		* Rotate through the allocation groups looking for a winner.

fs/xfs/libxfs/xfs_da_btree.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ xfs_da3_node_read_verify(
		__this_address);
		break;
		}
		/* fall through */
		fallthrough;
		case XFS_DA_NODE_MAGIC:
		fa = xfs_da3_node_verify(bp);
		if (fa)

fs/xfs/scrub/agheader.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ xchk_superblock(
		case -ENOSYS:
		case -EFBIG:
		error = -EFSCORRUPTED;
		fallthrough;
		default:
		break;
		}

fs/xfs/scrub/bmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ xchk_bmap_iextent_xref(
		case XFS_DATA_FORK:
		if (xfs_is_reflink_inode(info->sc->ip))
		break;
		/* fall through */
		fallthrough;
		case XFS_ATTR_FORK:
		xchk_xref_is_not_shared(info->sc, agbno,
		irec->br_blockcount);