diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-01-11 15:32:01 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-01-11 15:32:01 +1100 |
| commit | 13059ff04c5071c3f6f8a4bd9e51631849f63fa4 (patch) | |
| tree | 5a038d985cefde848e52c7bc232a71df454f3e0e /fs/xfs/xfs_bmap.c | |
| parent | e13a73f02595c564e423bda5742fb8df4ebca455 (diff) | |
| download | linux-13059ff04c5071c3f6f8a4bd9e51631849f63fa4.tar.gz linux-13059ff04c5071c3f6f8a4bd9e51631849f63fa4.tar.bz2 linux-13059ff04c5071c3f6f8a4bd9e51631849f63fa4.zip | |
[XFS] Reverse the sense of COMPAT_ATTR and ATTR2, keeps it simple and
consistent.
SGI-PV: 941645
SGI-Modid: xfs-linux-melb:xfs-kern:202961a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 8a32d65211b0..8ac170b828f5 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -3948,7 +3948,7 @@ xfs_bmap_add_attrfork( ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size); if (!ip->i_d.di_forkoff) ip->i_d.di_forkoff = mp->m_attroffset >> 3; - else if (!(mp->m_flags & XFS_MOUNT_COMPAT_ATTR)) + else if (mp->m_flags & XFS_MOUNT_ATTR2) version = 2; break; default: @@ -4096,13 +4096,13 @@ xfs_bmap_compute_maxlevels( */ if (whichfork == XFS_DATA_FORK) { maxleafents = MAXEXTNUM; - sz = (mp->m_flags & XFS_MOUNT_COMPAT_ATTR) ? - mp->m_attroffset : XFS_BMDR_SPACE_CALC(MINDBTPTRS); + sz = (mp->m_flags & XFS_MOUNT_ATTR2) ? + XFS_BMDR_SPACE_CALC(MINDBTPTRS) : mp->m_attroffset; } else { maxleafents = MAXAEXTNUM; - sz = (mp->m_flags & XFS_MOUNT_COMPAT_ATTR) ? - mp->m_sb.sb_inodesize - mp->m_attroffset : - XFS_BMDR_SPACE_CALC(MINABTPTRS); + sz = (mp->m_flags & XFS_MOUNT_ATTR2) ? + XFS_BMDR_SPACE_CALC(MINABTPTRS) : + mp->m_sb.sb_inodesize - mp->m_attroffset; } maxrootrecs = (int)XFS_BTREE_BLOCK_MAXRECS(sz, xfs_bmdr, 0); minleafrecs = mp->m_bmap_dmnr[0]; |