From: Christoph Hellwig Date: Mon, 21 Oct 2024 00:10:41 +0000 (-0700) Subject: xfs: remove xfs_validate_rtextents X-Git-Tag: v6.12.0~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7220f58bed911926e9e357415c7325e1e6c75650;p=thirdparty%2Fxfsprogs-dev.git xfs: remove xfs_validate_rtextents Source kernel commit: 021d9c107e29a598e51fb66a54b22e5416125408 Replace xfs_validate_rtextents with an open coded check for 0 rtextents. The name for the function implies it does a lot more than a zero check, which is more obvious when open coded. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c index bedb36a0..a50c9c06 100644 --- a/libxfs/xfs_sb.c +++ b/libxfs/xfs_sb.c @@ -511,7 +511,7 @@ xfs_validate_sb_common( rbmblocks = howmany_64(sbp->sb_rextents, NBBY * sbp->sb_blocksize); - if (!xfs_validate_rtextents(rexts) || + if (sbp->sb_rextents == 0 || sbp->sb_rextents != rexts || sbp->sb_rextslog != xfs_compute_rextslog(rexts) || sbp->sb_rbmblocks != rbmblocks) { diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h index 76eb9e32..a8cd44d0 100644 --- a/libxfs/xfs_types.h +++ b/libxfs/xfs_types.h @@ -235,16 +235,4 @@ bool xfs_verify_fileoff(struct xfs_mount *mp, xfs_fileoff_t off); bool xfs_verify_fileext(struct xfs_mount *mp, xfs_fileoff_t off, xfs_fileoff_t len); -/* Do we support an rt volume having this number of rtextents? */ -static inline bool -xfs_validate_rtextents( - xfs_rtbxlen_t rtextents) -{ - /* No runt rt volumes */ - if (rtextents == 0) - return false; - - return true; -} - #endif /* __XFS_TYPES_H__ */