diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-20 00:57:02 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-20 00:57:02 +0200 |
| commit | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch) | |
| tree | cccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_dir2.c | |
| parent | Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next (diff) | |
| parent | xfs: remove shared supberlock feature checking (diff) | |
| download | linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.xz linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip | |
Merge branch 'xfs-feature-bit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_dir2.c')
| -rw-r--r-- | fs/xfs/xfs_dir2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index e365c98c0f1e..93fcebd5edd2 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c @@ -92,7 +92,7 @@ xfs_dir_mount( int nodehdr_size; - ASSERT(xfs_sb_version_hasdirv2(&mp->m_sb)); + ASSERT(mp->m_sb.sb_versionnum & XFS_SB_VERSION_DIRV2BIT); ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <= XFS_MAX_BLOCKSIZE); |