summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2_readdir.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 15:06:53 +1000
committerDave Chinner <david@fromorbit.com>2014-06-06 15:06:53 +1000
commit9b3b5522d3f55215ce51c87b0467926c57a6f182 (patch)
treedf132e36493de332a7435211d5b982fcc9049445 /fs/xfs/xfs_dir2_readdir.c
parent8c44a28561625d36591cc1540eb5f9033a9d1815 (diff)
downloadlinux-9b3b5522d3f55215ce51c87b0467926c57a6f182.tar.bz2
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(
/*
* Having done a read, we need to set a new offset.
*/
- newoff = xfs_dir2_db_off_to_byte(mp, map_info->curdb, 0);
+ newoff = xfs_dir2_db_off_to_byte(mp->m_dir_geo,
+ map_info->curdb, 0);
/*
* Start of the current block.
*/
@@ -578,7 +579,7 @@ xfs_dir2_leaf_getdents(
* Find our position in the block.
*/
ptr = (char *)dp->d_ops->data_entry_p(hdr);
- byteoff = xfs_dir2_byte_to_off(mp, curoff);
+ byteoff = xfs_dir2_byte_to_off(mp->m_dir_geo, curoff);
/*
* Skip past the header.
*/
@@ -607,7 +608,7 @@ xfs_dir2_leaf_getdents(
* Now set our real offset.
*/
curoff =
- xfs_dir2_db_off_to_byte(mp,
+ xfs_dir2_db_off_to_byte(mp->m_dir_geo,
xfs_dir2_byte_to_db(mp, curoff),
(char *)ptr - (char *)hdr);
if (ptr >= (char *)hdr + mp->m_dirblksize) {