1 files changed, 3 insertions, 3 deletions

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index bc08216089d8..d950cde3afeb 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -136,7 +136,7 @@ xfs_dir3_block_read(
         struct xfs_mount        *mp = dp->i_mount;
         int                     err;
 
-        err = xfs_da_read_buf(tp, dp, mp->m_dirdatablk, -1, bpp,
+        err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, -1, bpp,
                                 XFS_DATA_FORK, &xfs_dir3_block_buf_ops);
         if (!err && tp)
                 xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF);
@@ -969,7 +969,7 @@ xfs_dir2_leaf_to_block(
          * Read the data block if we don't already have it, give up if it fails.
          */
         if (!dbp) {
-                error = xfs_dir3_data_read(tp, dp, mp->m_dirdatablk, -1, &dbp);
+                error = xfs_dir3_data_read(tp, dp, args->geo->datablk, -1, &dbp);
                 if (error)
                         return error;
         }
@@ -1034,7 +1034,7 @@ xfs_dir2_leaf_to_block(
         /*
          * Pitch the old leaf block.
          */
-        error = xfs_da_shrink_inode(args, mp->m_dirleafblk, lbp);
+        error = xfs_da_shrink_inode(args, args->geo->leafblk, lbp);
         if (error)
                 return error;