On Tue, Dec 14, 2021 at 02:15:12PM +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@xxxxxxxxxx>
Seems pretty straightforward so far; let's see what I think as I keep
going...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_format.h | 10 +++++++++-
> fs/xfs/libxfs/xfs_ialloc.c | 2 ++
> fs/xfs/xfs_inode.h | 5 +++++
> fs/xfs/xfs_inode_item_recover.c | 6 ++++++
> 4 files changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index 7972cbc22608..9934c320bf01 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -992,15 +992,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)
> {
> @@ -1008,6 +1010,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/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index b418fe0c0679..1d2ba51483ec 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -2772,6 +2772,8 @@ xfs_ialloc_setup_geometry(
> igeo->new_diflags2 = 0;
> if (xfs_has_bigtime(mp))
> igeo->new_diflags2 |= XFS_DIFLAG2_BIGTIME;
> + if (xfs_has_nrext64(mp))
> + igeo->new_diflags2 |= XFS_DIFLAG2_NREXT64;
>
> /* Compute inode btree geometry. */
> igeo->agino_log = sbp->sb_inopblog + sbp->sb_agblklog;
> diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> index c447bf04205a..97946156359d 100644
> --- a/fs/xfs/xfs_inode.h
> +++ b/fs/xfs/xfs_inode.h
> @@ -218,6 +218,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;
> +}
> +
> /*
> * Return the buftarg used for data allocations on a given inode.
> */
> diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
> index 239dd2e3384e..767a551816a0 100644
> --- a/fs/xfs/xfs_inode_item_recover.c
> +++ b/fs/xfs/xfs_inode_item_recover.c
> @@ -142,6 +142,12 @@ xfs_log_dinode_to_disk_ts(
> return ts;
> }
>
> +static inline bool xfs_log_dinode_has_nrext64(const struct xfs_log_dinode *ld)
> +{
> + return ld->di_version >= 3 &&
> + (ld->di_flags2 & XFS_DIFLAG2_NREXT64);
> +}
> +
> STATIC void
> xfs_log_dinode_to_disk(
> struct xfs_log_dinode *from,
> --
> 2.30.2
>
