From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 14/16] xfs: remove unused xfs_sb_version_has wrappers
Date: Wed, 14 Jul 2021 16:21:18 -0700 [thread overview]
Message-ID: <20210714232118.GH22402@magnolia> (raw)
In-Reply-To: <20210714041912.2625692-15-david@fromorbit.com>
On Wed, Jul 14, 2021 at 02:19:10PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The vast majority of these wrappers are now unused. Remove them
> leaving just the small subset of wrappers that are used to either
> add feature bits or make the mount features field setup code
> simpler.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
MMMMM code removal!
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_format.h | 155 +------------------------------------
> 1 file changed, 3 insertions(+), 152 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index d1b0933c90eb..0bd44a780937 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -279,11 +279,6 @@ typedef struct xfs_dsb {
>
> #define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS)
>
> -static inline bool xfs_sb_version_hasrealtime(struct xfs_sb *sbp)
> -{
> - return sbp->sb_rblocks > 0;
> -}
> -
> /*
> * Detect a mismatched features2 field. Older kernels read/wrote
> * this into the wrong slot, so to be safe we keep them in sync.
> @@ -293,9 +288,10 @@ static inline bool xfs_sb_has_mismatched_features2(struct xfs_sb *sbp)
> return sbp->sb_bad_features2 != sbp->sb_features2;
> }
>
> -static inline bool xfs_sb_version_hasattr(struct xfs_sb *sbp)
> +static inline bool xfs_sb_version_hasmorebits(struct xfs_sb *sbp)
> {
> - return (sbp->sb_versionnum & XFS_SB_VERSION_ATTRBIT);
> + return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 ||
> + (sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT);
> }
>
> static inline void xfs_sb_version_addattr(struct xfs_sb *sbp)
> @@ -303,79 +299,17 @@ static inline void xfs_sb_version_addattr(struct xfs_sb *sbp)
> sbp->sb_versionnum |= XFS_SB_VERSION_ATTRBIT;
> }
>
> -static inline bool xfs_sb_version_hasquota(struct xfs_sb *sbp)
> -{
> - return (sbp->sb_versionnum & XFS_SB_VERSION_QUOTABIT);
> -}
> -
> static inline void xfs_sb_version_addquota(struct xfs_sb *sbp)
> {
> sbp->sb_versionnum |= XFS_SB_VERSION_QUOTABIT;
> }
>
> -static inline bool xfs_sb_version_hasalign(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 ||
> - (sbp->sb_versionnum & XFS_SB_VERSION_ALIGNBIT));
> -}
> -
> -static inline bool xfs_sb_version_hasdalign(struct xfs_sb *sbp)
> -{
> - return (sbp->sb_versionnum & XFS_SB_VERSION_DALIGNBIT);
> -}
> -
> -static inline bool xfs_sb_version_haslogv2(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 ||
> - (sbp->sb_versionnum & XFS_SB_VERSION_LOGV2BIT);
> -}
> -
> -static inline bool xfs_sb_version_hassector(struct xfs_sb *sbp)
> -{
> - return (sbp->sb_versionnum & XFS_SB_VERSION_SECTORBIT);
> -}
> -
> -static inline bool xfs_sb_version_hasasciici(struct xfs_sb *sbp)
> -{
> - return (sbp->sb_versionnum & XFS_SB_VERSION_BORGBIT);
> -}
> -
> -static inline bool xfs_sb_version_hasmorebits(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 ||
> - (sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT);
> -}
> -
> -/*
> - * sb_features2 bit version macros.
> - */
> -static inline bool xfs_sb_version_haslazysbcount(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) ||
> - (xfs_sb_version_hasmorebits(sbp) &&
> - (sbp->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT));
> -}
> -
> -static inline bool xfs_sb_version_hasattr2(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) ||
> - (xfs_sb_version_hasmorebits(sbp) &&
> - (sbp->sb_features2 & XFS_SB_VERSION2_ATTR2BIT));
> -}
> -
> static inline void xfs_sb_version_addattr2(struct xfs_sb *sbp)
> {
> sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT;
> sbp->sb_features2 |= XFS_SB_VERSION2_ATTR2BIT;
> }
>
> -static inline bool xfs_sb_version_hasprojid32(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) ||
> - (xfs_sb_version_hasmorebits(sbp) &&
> - (sbp->sb_features2 & XFS_SB_VERSION2_PROJID32BIT));
> -}
> -
> static inline void xfs_sb_version_addprojid32(struct xfs_sb *sbp)
> {
> sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT;
> @@ -459,13 +393,6 @@ xfs_sb_has_incompat_log_feature(
> return (sbp->sb_features_log_incompat & feature) != 0;
> }
>
> -/*
> - * V5 superblock specific feature checks
> - */
> -static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;
> -}
>
> /*
> * v5 file systems support V3 inodes only, earlier file systems support
> @@ -484,82 +411,6 @@ static inline bool xfs_dinode_good_version(struct xfs_sb *sbp,
> return version == 1 || version == 2;
> }
>
> -static inline bool xfs_sb_version_haspquotino(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;
> -}
> -
> -static inline int xfs_sb_version_hasftype(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - xfs_sb_has_incompat_feature(sbp, XFS_SB_FEAT_INCOMPAT_FTYPE)) ||
> - (xfs_sb_version_hasmorebits(sbp) &&
> - (sbp->sb_features2 & XFS_SB_VERSION2_FTYPE));
> -}
> -
> -static inline bool xfs_sb_version_hasfinobt(xfs_sb_t *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) &&
> - (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_FINOBT);
> -}
> -
> -static inline bool xfs_sb_version_hassparseinodes(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - xfs_sb_has_incompat_feature(sbp, XFS_SB_FEAT_INCOMPAT_SPINODES);
> -}
> -
> -/*
> - * XFS_SB_FEAT_INCOMPAT_META_UUID indicates that the metadata UUID
> - * is stored separately from the user-visible UUID; this allows the
> - * user-visible UUID to be changed on V5 filesystems which have a
> - * filesystem UUID stamped into every piece of metadata.
> - */
> -static inline bool xfs_sb_version_hasmetauuid(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) &&
> - (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_META_UUID);
> -}
> -
> -static inline bool xfs_sb_version_hasrmapbt(struct xfs_sb *sbp)
> -{
> - return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) &&
> - (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RMAPBT);
> -}
> -
> -static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_REFLINK);
> -}
> -
> -static inline bool xfs_sb_version_hasbigtime(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_BIGTIME);
> -}
> -
> -/*
> - * Inode btree block counter. We record the number of inobt and finobt blocks
> - * in the AGI header so that we can skip the finobt walk at mount time when
> - * setting up per-AG reservations.
> - */
> -static inline bool xfs_sb_version_hasinobtcounts(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_INOBTCNT);
> -}
> -
> -static inline bool xfs_sb_version_needsrepair(struct xfs_sb *sbp)
> -{
> - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR);
> -}
> -
> -/*
> - * end of superblock version macros
> - */
> -
> static inline bool
> xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
> {
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-07-14 23:21 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 4:18 [PATCH 00/16] xfs: rework feature flags Dave Chinner
2021-07-14 4:18 ` [PATCH 01/16] xfs: sb verifier doesn't handle uncached sb buffer Dave Chinner
2021-07-14 6:43 ` Christoph Hellwig
2021-07-14 9:37 ` Dave Chinner
2021-07-14 22:44 ` Darrick J. Wong
2021-07-14 23:00 ` Dave Chinner
2021-07-14 23:03 ` Darrick J. Wong
2021-07-14 4:18 ` [PATCH 02/16] xfs: rename xfs_has_attr() Dave Chinner
2021-07-14 6:49 ` Christoph Hellwig
2021-07-14 22:46 ` Darrick J. Wong
2021-07-14 4:18 ` [PATCH 03/16] xfs: rework attr2 feature and mount options Dave Chinner
2021-07-14 6:58 ` Christoph Hellwig
2021-07-14 9:45 ` Dave Chinner
2021-07-15 5:55 ` Christoph Hellwig
2021-07-15 23:47 ` Dave Chinner
2021-07-16 9:43 ` Christoph Hellwig
2021-07-14 22:51 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 04/16] xfs: reflect sb features in xfs_mount Dave Chinner
2021-07-14 7:01 ` Christoph Hellwig
2021-07-14 22:56 ` Darrick J. Wong
2021-07-14 23:07 ` Dave Chinner
2021-07-14 23:17 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 05/16] xfs: replace xfs_sb_version checks with feature flag checks Dave Chinner
2021-07-14 7:03 ` Christoph Hellwig
2021-07-14 22:57 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 06/16] xfs: consolidate mount option features in m_features Dave Chinner
2021-07-14 7:05 ` Christoph Hellwig
2021-07-14 9:55 ` Dave Chinner
2021-07-15 5:59 ` Christoph Hellwig
2021-07-15 23:43 ` Dave Chinner
2021-07-14 23:02 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 07/16] xfs: convert mount flags to features Dave Chinner
2021-07-14 23:07 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 08/16] xfs: convert remaining mount flags to state flags Dave Chinner
2021-07-14 23:10 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 09/16] xfs: replace XFS_FORCED_SHUTDOWN with xfs_is_shutdown Dave Chinner
2021-07-14 23:11 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 10/16] xfs: convert xfs_fs_geometry to use mount feature checks Dave Chinner
2021-07-14 7:11 ` Christoph Hellwig
2021-07-14 23:15 ` Darrick J. Wong
2021-07-14 23:35 ` Dave Chinner
2021-07-14 23:38 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 11/16] xfs: open code sb verifier " Dave Chinner
2021-07-14 7:19 ` Christoph Hellwig
2021-07-16 0:26 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 12/16] xfs: convert scrub to use mount-based " Dave Chinner
2021-07-14 23:18 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 13/16] xfs: convert xfs_sb_version_has checks to use mount features Dave Chinner
2021-07-14 23:19 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 14/16] xfs: remove unused xfs_sb_version_has wrappers Dave Chinner
2021-07-14 23:21 ` Darrick J. Wong [this message]
2021-07-14 4:19 ` [PATCH 15/16] xfs: introduce xfs_sb_is_v5 helper Dave Chinner
2021-07-14 23:24 ` Darrick J. Wong
2021-07-14 4:19 ` [PATCH 16/16] xfs: kill xfs_sb_version_has_v3inode() Dave Chinner
2021-07-14 23:24 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2021-08-10 5:24 [PATCH 00/16 v2] xfs: rework feature flags Dave Chinner
2021-08-10 5:24 ` [PATCH 14/16] xfs: remove unused xfs_sb_version_has wrappers Dave Chinner
2021-08-18 23:59 [PATCH 00/16 v3] xfs: rework feature flags Dave Chinner
2021-08-18 23:59 ` [PATCH 14/16] xfs: remove unused xfs_sb_version_has wrappers Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714232118.GH22402@magnolia \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).