diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
| commit | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch) | |
| tree | cccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_fsops.c | |
| parent | 0d907a3bb4a77cffebebd17c323e898048301aa3 (diff) | |
| parent | ab3e57b53f549ad51cbdf85e846ca4eaf0f3be30 (diff) | |
| download | linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.gz linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.bz2 linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip | |
Merge branch 'xfs-feature-bit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 9 |
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) ? |