diff options
author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
commit | 4d7eece2c0dad832c5f224629eba3cced3f2d6cd (patch) | |
tree | cddf541ea3c2860aaea0fed1f57871d310c3c14e /fs/xfs/xfs_bmap_util.c | |
parent | e0ac6d45bc52065d388b5aa153b58233af25a429 (diff) | |
parent | d5cf09baced0ef3d2cc118865079f8b129e98e2f (diff) | |
download | op-kernel-dev-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.zip op-kernel-dev-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.tar.gz |
Merge branch 'xfs-misc-fixes-3.17-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
-rw-r--r-- | fs/xfs/xfs_bmap_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 43a9744..d32889a 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -425,7 +425,7 @@ xfs_bmap_count_blocks( ASSERT(level > 0); pp = XFS_BMAP_BROOT_PTR_ADDR(mp, block, 1, ifp->if_broot_bytes); bno = be64_to_cpu(*pp); - ASSERT(bno != NULLDFSBNO); + ASSERT(bno != NULLFSBLOCK); ASSERT(XFS_FSB_TO_AGNO(mp, bno) < mp->m_sb.sb_agcount); ASSERT(XFS_FSB_TO_AGBNO(mp, bno) < mp->m_sb.sb_agblocks); |