On Wed, Aug 09, 2017 at 06:41:33PM -0700, Allison Henderson wrote: > [dchinner: forward ported and cleaned up] > [achender: rebased and added parent pointer attribute to > compatible attributes mask] > > Signed-off-by: Mark Tinguely <tinguely@xxxxxxx> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx> > --- > :100644 100644 6cedd75... b00bf1d... M fs/xfs/libxfs/xfs_format.h > :100644 100644 fba0105... a18dd0c... M fs/xfs/libxfs/xfs_fs.h > :100644 100644 50fb3a2... d7b9010... M fs/xfs/xfs_fsops.c > fs/xfs/libxfs/xfs_format.h | 13 ++++++++----- > fs/xfs/libxfs/xfs_fs.h | 1 + > fs/xfs/xfs_fsops.c | 4 +++- > 3 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h > index 6cedd75..b00bf1d 100644 > --- a/fs/xfs/libxfs/xfs_format.h > +++ b/fs/xfs/libxfs/xfs_format.h > @@ -464,10 +464,12 @@ xfs_sb_has_compat_feature( > #define XFS_SB_FEAT_RO_COMPAT_FINOBT (1 << 0) /* free inode btree */ > #define XFS_SB_FEAT_RO_COMPAT_RMAPBT (1 << 1) /* reverse map btree */ > #define XFS_SB_FEAT_RO_COMPAT_REFLINK (1 << 2) /* reflinked files */ > +#define XFS_SB_FEAT_RO_COMPAT_PARENT (1 << 3) /* parent inode ptr */ > #define XFS_SB_FEAT_RO_COMPAT_ALL \ > (XFS_SB_FEAT_RO_COMPAT_FINOBT | \ > XFS_SB_FEAT_RO_COMPAT_RMAPBT | \ > - XFS_SB_FEAT_RO_COMPAT_REFLINK) > + XFS_SB_FEAT_RO_COMPAT_REFLINK| \ > + XFS_SB_FEAT_RO_COMPAT_PARENT) > #define XFS_SB_FEAT_RO_COMPAT_UNKNOWN ~XFS_SB_FEAT_RO_COMPAT_ALL > static inline bool > xfs_sb_has_ro_compat_feature( > @@ -507,17 +509,17 @@ xfs_sb_has_incompat_log_feature( > /* > * V5 superblock specific feature checks > */ > -static inline int xfs_sb_version_hascrc(struct xfs_sb *sbp) > +static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp) > { > return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; > } > > -static inline int xfs_sb_version_has_pquotino(struct xfs_sb *sbp) > +static inline bool xfs_sb_version_has_pquotino(struct xfs_sb *sbp) Not part of parent pointers; if you want to fix this, do it in a separate patch, please. --D > { > return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; > } > > -static inline int xfs_sb_version_hasftype(struct xfs_sb *sbp) > +static inline bool 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)) || > @@ -563,7 +565,8 @@ static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp) > > static inline bool xfs_sb_version_hasparent(struct xfs_sb *sbp) > { > - return false; /* We'll enable this at the end of the set */ > + return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 && > + (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_PARENT)); > } > > /* > diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h > index fba0105..a18dd0c 100644 > --- a/fs/xfs/libxfs/xfs_fs.h > +++ b/fs/xfs/libxfs/xfs_fs.h > @@ -222,6 +222,7 @@ typedef struct xfs_fsop_resblks { > #define XFS_FSOP_GEOM_FLAGS_SPINODES 0x40000 /* sparse inode chunks */ > #define XFS_FSOP_GEOM_FLAGS_RMAPBT 0x80000 /* reverse mapping btree */ > #define XFS_FSOP_GEOM_FLAGS_REFLINK 0x100000 /* files can share blocks */ > +#define XFS_FSOP_GEOM_FLAGS_PARENT 0x200000 /* parent pointers */ > > /* > * Minimum and maximum sizes need for growth checks. > diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c > index 50fb3a2..d7b9010 100644 > --- a/fs/xfs/xfs_fsops.c > +++ b/fs/xfs/xfs_fsops.c > @@ -112,7 +112,9 @@ xfs_fs_geometry( > (xfs_sb_version_hasrmapbt(&mp->m_sb) ? > XFS_FSOP_GEOM_FLAGS_RMAPBT : 0) | > (xfs_sb_version_hasreflink(&mp->m_sb) ? > - XFS_FSOP_GEOM_FLAGS_REFLINK : 0); > + XFS_FSOP_GEOM_FLAGS_REFLINK : 0) | > + (xfs_sb_version_hasparent(&mp->m_sb) ? > + XFS_FSOP_GEOM_FLAGS_PARENT : 0); > geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? > mp->m_sb.sb_logsectsize : BBSIZE; > geo->rtsectsize = mp->m_sb.sb_blocksize; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html