diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-09 16:24:48 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-09 16:24:48 +1100 |
| commit | ce79735c12d62c3cda38eb31762cf98e87c7b087 (patch) | |
| tree | 589b8ab95e36c3f7012d65eccfdcc3e81f4afc50 /fs/xfs/xfs_dir2_leaf.c | |
| parent | 6206aa8b2b9a45b4cf3ee31b7209b014be349fd9 (diff) | |
| parent | 058652a37dd9eac18d6b8c1a311137c679de9dae (diff) | |
| download | kernel_replicant_linux-ce79735c12d62c3cda38eb31762cf98e87c7b087.tar.gz kernel_replicant_linux-ce79735c12d62c3cda38eb31762cf98e87c7b087.tar.bz2 kernel_replicant_linux-ce79735c12d62c3cda38eb31762cf98e87c7b087.zip | |
Merge branch 'for-linus' of git+ssh://git.melbourne.sgi.com/git/xfs
Diffstat (limited to 'fs/xfs/xfs_dir2_leaf.c')
| -rw-r--r-- | fs/xfs/xfs_dir2_leaf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c index 93535992cb60..ef805a374eec 100644 --- a/fs/xfs/xfs_dir2_leaf.c +++ b/fs/xfs/xfs_dir2_leaf.c @@ -1092,7 +1092,7 @@ xfs_dir2_leaf_getdents( * Won't fit. Return to caller. */ if (filldir(dirent, dep->name, dep->namelen, - xfs_dir2_byte_to_dataptr(mp, curoff), + xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff, ino, DT_UNKNOWN)) break; @@ -1108,9 +1108,9 @@ xfs_dir2_leaf_getdents( * All done. Set output offset value to current offset. */ if (curoff > xfs_dir2_dataptr_to_byte(mp, XFS_DIR2_MAX_DATAPTR)) - *offset = XFS_DIR2_MAX_DATAPTR; + *offset = XFS_DIR2_MAX_DATAPTR & 0x7fffffff; else - *offset = xfs_dir2_byte_to_dataptr(mp, curoff); + *offset = xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff; kmem_free(map); if (bp) xfs_da_brelse(NULL, bp); |