diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:10:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:10:34 -0500 |
commit | 9f5974c8734d83d4ab7096ed98136a82f41210d6 (patch) | |
tree | 6f328555796bafefb74936ab68128aa84efd28b1 /fs/xfs/xfs_dir.c | |
parent | a2d823bf13efea4c859376f6e85c49cfbad7ab60 (diff) | |
parent | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (diff) |
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
Diffstat (limited to 'fs/xfs/xfs_dir.c')
-rw-r--r-- | fs/xfs/xfs_dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir.c b/fs/xfs/xfs_dir.c index 3dd30391f551..bb87d2a700a9 100644 --- a/fs/xfs/xfs_dir.c +++ b/fs/xfs/xfs_dir.c | |||
@@ -176,7 +176,7 @@ xfs_dir_mount(xfs_mount_t *mp) | |||
176 | uint shortcount, leafcount, count; | 176 | uint shortcount, leafcount, count; |
177 | 177 | ||
178 | mp->m_dirversion = 1; | 178 | mp->m_dirversion = 1; |
179 | if (mp->m_flags & XFS_MOUNT_COMPAT_ATTR) { | 179 | if (!(mp->m_flags & XFS_MOUNT_ATTR2)) { |
180 | shortcount = (mp->m_attroffset - | 180 | shortcount = (mp->m_attroffset - |
181 | (uint)sizeof(xfs_dir_sf_hdr_t)) / | 181 | (uint)sizeof(xfs_dir_sf_hdr_t)) / |
182 | (uint)sizeof(xfs_dir_sf_entry_t); | 182 | (uint)sizeof(xfs_dir_sf_entry_t); |