Re: [PATCH V4 10/20] xfsprogs: Introduce XFS_DIFLAG2_NREXT64 and associated helpers

Darrick J. Wong
2022-01-05T01:08:29Z

On Tue, Dec 14, 2021 at 02:18:01PM +0530, Chandan Babu R wrote:
> This commit adds the new per-inode flag XFS_DIFLAG2_NREXT64 to indicate that
> an inode supports 64-bit extent counters. This flag is also enabled by default
> on newly created inodes when the corresponding filesystem has large extent
> counter feature bit (i.e. XFS_FEAT_NREXT64) set.
>
> Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
> ---
> db/inode.c | 3 +++
> include/xfs_inode.h | 5 +++++
> libxfs/xfs_format.h | 10 +++++++++-
> libxfs/xfs_ialloc.c | 2 ++
> 4 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/db/inode.c b/db/inode.c
> index 9afa6426..b1f92d36 100644
> --- a/db/inode.c
> +++ b/db/inode.c
> @@ -178,6 +178,9 @@ const field_t inode_v3_flds[] = {
> { "bigtime", FLDT_UINT1,
> OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_BIGTIME_BIT - 1), C1,
> 0, TYP_NONE },
> + { "nrext64", FLDT_UINT1,
> + OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_NREXT64_BIT-1), C1,

Nit: spaces around the '-' operator.

--D

> + 0, TYP_NONE },
> { NULL }
> };
>
> diff --git a/include/xfs_inode.h b/include/xfs_inode.h
> index 08a62d83..79a5c526 100644
> --- a/include/xfs_inode.h
> +++ b/include/xfs_inode.h
> @@ -164,6 +164,11 @@ static inline bool xfs_inode_has_bigtime(struct xfs_inode *ip)
> return ip->i_diflags2 & XFS_DIFLAG2_BIGTIME;
> }
>
> +static inline bool xfs_inode_has_nrext64(struct xfs_inode *ip)
> +{
> + return ip->i_diflags2 & XFS_DIFLAG2_NREXT64;
> +}
> +
> typedef struct cred {
> uid_t cr_uid;
> gid_t cr_gid;
> diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
> index 23ecbc7d..58186f2b 100644
> --- a/libxfs/xfs_format.h
> +++ b/libxfs/xfs_format.h
> @@ -1180,15 +1180,17 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
> #define XFS_DIFLAG2_REFLINK_BIT 1 /* file's blocks may be shared */
> #define XFS_DIFLAG2_COWEXTSIZE_BIT 2 /* copy on write extent size hint */
> #define XFS_DIFLAG2_BIGTIME_BIT 3 /* big timestamps */
> +#define XFS_DIFLAG2_NREXT64_BIT 4 /* 64-bit extent counter enabled */
>
> #define XFS_DIFLAG2_DAX (1 << XFS_DIFLAG2_DAX_BIT)
> #define XFS_DIFLAG2_REFLINK (1 << XFS_DIFLAG2_REFLINK_BIT)
> #define XFS_DIFLAG2_COWEXTSIZE (1 << XFS_DIFLAG2_COWEXTSIZE_BIT)
> #define XFS_DIFLAG2_BIGTIME (1 << XFS_DIFLAG2_BIGTIME_BIT)
> +#define XFS_DIFLAG2_NREXT64 (1 << XFS_DIFLAG2_NREXT64_BIT)
>
> #define XFS_DIFLAG2_ANY \
> (XFS_DIFLAG2_DAX | XFS_DIFLAG2_REFLINK | XFS_DIFLAG2_COWEXTSIZE | \
> - XFS_DIFLAG2_BIGTIME)
> + XFS_DIFLAG2_BIGTIME | XFS_DIFLAG2_NREXT64)
>
> static inline bool xfs_dinode_has_bigtime(const struct xfs_dinode *dip)
> {
> @@ -1196,6 +1198,12 @@ static inline bool xfs_dinode_has_bigtime(const struct xfs_dinode *dip)
> (dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_BIGTIME));
> }
>
> +static inline bool xfs_dinode_has_nrext64(const struct xfs_dinode *dip)
> +{
> + return dip->di_version >= 3 &&
> + (dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_NREXT64));
> +}
> +
> /*
> * Inode number format:
> * low inopblog bits - offset in block
> diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
> index 570349b8..77501317 100644
> --- a/libxfs/xfs_ialloc.c
> +++ b/libxfs/xfs_ialloc.c
> @@ -2770,6 +2770,8 @@ xfs_ialloc_setup_geometry(
> igeo->new_diflags2 = 0;
> if (xfs_sb_version_hasbigtime(&mp->m_sb))
> igeo->new_diflags2 |= XFS_DIFLAG2_BIGTIME;
> + if (xfs_sb_version_hasnrext64(&mp->m_sb))
> + igeo->new_diflags2 |= XFS_DIFLAG2_NREXT64;
>
> /* Compute inode btree geometry. */
> igeo->agino_log = sbp->sb_inopblog + sbp->sb_agblklog;
> --
> 2.30.2
>