xfs: convert directory segment limits 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>

1 files changed, 9 insertions, 9 deletions

diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index c2a63878d27c..0c8c09cf313f 100644
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -111,18 +111,18 @@ xfs_dir2_sf_getdents(
         /*
          * If the block number in the offset is out of range, we're done.
          */
-        if (xfs_dir2_dataptr_to_db(geo, ctx->pos) > mp->m_dirdatablk)
+        if (xfs_dir2_dataptr_to_db(geo, ctx->pos) > geo->datablk)
                 return 0;
 
         /*
          * Precalculate offsets for . and .. as we will always need them.
          *
          * XXX(hch): the second argument is sometimes 0 and sometimes
-         * mp->m_dirdatablk.
+         * geo->datablk
          */
-        dot_offset = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk,
+        dot_offset = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
                                                 dp->d_ops->data_dot_offset);
-        dotdot_offset = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk,
+        dotdot_offset = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
                                                 dp->d_ops->data_dotdot_offset);
 
         /*
@@ -151,7 +151,7 @@ xfs_dir2_sf_getdents(
         for (i = 0; i < sfp->count; i++) {
                 __uint8_t filetype;
 
-                off = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk,
+                off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
                                 xfs_dir2_sf_get_offset(sfep));
 
                 if (ctx->pos > off) {
@@ -168,7 +168,7 @@ xfs_dir2_sf_getdents(
                 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
         }
 
-        ctx->pos = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk + 1, 0) &
+        ctx->pos = xfs_dir2_db_off_to_dataptr(geo, geo->datablk + 1, 0) &
                         0x7fffffff;
         return 0;
 }
@@ -199,7 +199,7 @@ xfs_dir2_block_getdents(
         /*
          * If the block number in the offset is out of range, we're done.
          */
-        if (xfs_dir2_dataptr_to_db(geo, ctx->pos) > mp->m_dirdatablk)
+        if (xfs_dir2_dataptr_to_db(geo, ctx->pos) > geo->datablk)
                 return 0;
 
         error = xfs_dir3_block_read(NULL, dp, &bp);
@@ -248,7 +248,7 @@ xfs_dir2_block_getdents(
                 if ((char *)dep - (char *)hdr < wantoff)
                         continue;
 
-                cook = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk,
+                cook = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
                                             (char *)dep - (char *)hdr);
 
                 ctx->pos = cook & 0x7fffffff;
@@ -268,7 +268,7 @@ xfs_dir2_block_getdents(
          * Reached the end of the block.
          * Set the offset to a non-existent block 1 and return.
          */
-        ctx->pos = xfs_dir2_db_off_to_dataptr(geo, mp->m_dirdatablk + 1, 0) &
+        ctx->pos = xfs_dir2_db_off_to_dataptr(geo, geo->datablk + 1, 0) &
                         0x7fffffff;
         xfs_trans_brelse(NULL, bp);
         return 0;