aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2_readdir.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 01:06:53 -0400
committerDave Chinner <david@fromorbit.com>2014-06-06 01:06:53 -0400
commit9b3b5522d3f55215ce51c87b0467926c57a6f182 (patch)
treedf132e36493de332a7435211d5b982fcc9049445 /fs/xfs/xfs_dir2_readdir.c
parent8c44a28561625d36591cc1540eb5f9033a9d1815 (diff)
xfs: convert dir byte/off conversion to xfs_da_geometry
Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_dir2_readdir.c')
-rw-r--r--fs/xfs/xfs_dir2_readdir.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index bf7a5cee7adc..ec912c8f1891 100644
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -560,7 +560,8 @@ xfs_dir2_leaf_getdents(
560 /* 560 /*
561 * Having done a read, we need to set a new offset. 561 * Having done a read, we need to set a new offset.
562 */ 562 */
563 newoff = xfs_dir2_db_off_to_byte(mp, map_info->curdb, 0); 563 newoff = xfs_dir2_db_off_to_byte(mp->m_dir_geo,
564 map_info->curdb, 0);
564 /* 565 /*
565 * Start of the current block. 566 * Start of the current block.
566 */ 567 */
@@ -578,7 +579,7 @@ xfs_dir2_leaf_getdents(
578 * Find our position in the block. 579 * Find our position in the block.
579 */ 580 */
580 ptr = (char *)dp->d_ops->data_entry_p(hdr); 581 ptr = (char *)dp->d_ops->data_entry_p(hdr);
581 byteoff = xfs_dir2_byte_to_off(mp, curoff); 582 byteoff = xfs_dir2_byte_to_off(mp->m_dir_geo, curoff);
582 /* 583 /*
583 * Skip past the header. 584 * Skip past the header.
584 */ 585 */
@@ -607,7 +608,7 @@ xfs_dir2_leaf_getdents(
607 * Now set our real offset. 608 * Now set our real offset.
608 */ 609 */
609 curoff = 610 curoff =
610 xfs_dir2_db_off_to_byte(mp, 611 xfs_dir2_db_off_to_byte(mp->m_dir_geo,
611 xfs_dir2_byte_to_db(mp, curoff), 612 xfs_dir2_byte_to_db(mp, curoff),
612 (char *)ptr - (char *)hdr); 613 (char *)ptr - (char *)hdr);
613 if (ptr >= (char *)hdr + mp->m_dirblksize) { 614 if (ptr >= (char *)hdr + mp->m_dirblksize) {