Merge branch 'xfs-feature-bit-cleanup' into for-next

Conflicts:
	fs/xfs/xfs_inode.c

1 files changed, 2 insertions, 7 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 3445ead7c1fc..97886a74e073 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -74,23 +74,18 @@ xfs_fs_geometry(
         }
         if (new_version >= 3) {
                 geo->version = XFS_FSOP_GEOM_VERSION;
-                geo->flags =
+                geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK |
+                             XFS_FSOP_GEOM_FLAGS_DIRV2 |
                         (xfs_sb_version_hasattr(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_ATTR : 0) |
-                        (xfs_sb_version_hasnlink(&mp->m_sb) ?
-                                XFS_FSOP_GEOM_FLAGS_NLINK : 0) |
                         (xfs_sb_version_hasquota(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_QUOTA : 0) |
                         (xfs_sb_version_hasalign(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_IALIGN : 0) |
                         (xfs_sb_version_hasdalign(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_DALIGN : 0) |
-                        (xfs_sb_version_hasshared(&mp->m_sb) ?
-                                XFS_FSOP_GEOM_FLAGS_SHARED : 0) |
                         (xfs_sb_version_hasextflgbit(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) |
-                        (xfs_sb_version_hasdirv2(&mp->m_sb) ?
-                                XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) |
                         (xfs_sb_version_hassector(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_SECTOR : 0) |
                         (xfs_sb_version_hasasciici(&mp->m_sb) ?