diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-15 01:38:15 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-15 01:38:15 +0200 |
| commit | ff14ee42a038cf48263ac8d2eca5d30196554b82 (patch) | |
| tree | cee5ba7a2b08d7e4f48d974d08ecfc40c8bd1308 /fs/xfs/xfs_dir2_readdir.c | |
| parent | Merge branch 'xfs-free-inode-btree' into for-next (diff) | |
| parent | xfs: fix directory readahead offset off-by-one (diff) | |
| download | linux-ff14ee42a038cf48263ac8d2eca5d30196554b82.tar.xz linux-ff14ee42a038cf48263ac8d2eca5d30196554b82.zip | |
Merge branch 'xfs-misc-fixes-1-for-3.16' into for-next
Diffstat (limited to 'fs/xfs/xfs_dir2_readdir.c')
| -rw-r--r-- | fs/xfs/xfs_dir2_readdir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c index 50b72f7b8787..bf7a5cee7adc 100644 --- a/fs/xfs/xfs_dir2_readdir.c +++ b/fs/xfs/xfs_dir2_readdir.c @@ -456,7 +456,7 @@ xfs_dir2_leaf_readbuf( /* * Advance offset through the mapping table. */ - for (j = 0; j < mp->m_dirblkfsbs; j++) { + for (j = 0; j < mp->m_dirblkfsbs; j += length ) { /* * The rest of this extent but not more than a dir * block. @@ -464,7 +464,6 @@ xfs_dir2_leaf_readbuf( length = min_t(int, mp->m_dirblkfsbs, map[mip->ra_index].br_blockcount - mip->ra_offset); - j += length; mip->ra_offset += length; /* |