aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2_block.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 01:11:18 -0400
committerDave Chinner <david@fromorbit.com>2014-06-06 01:11:18 -0400
commit7dda6e8644a31c366484bbcb564ea6c6225e5963 (patch)
treedc950e33f53c391aabdf775d513f3fa92ad39792 /fs/xfs/xfs_dir2_block.c
parent30028030b14d083123c88e3ab45990a8c375abf1 (diff)
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>
Diffstat (limited to 'fs/xfs/xfs_dir2_block.c')
-rw-r--r--fs/xfs/xfs_dir2_block.c6
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(
136 struct xfs_mount *mp = dp->i_mount; 136 struct xfs_mount *mp = dp->i_mount;
137 int err; 137 int err;
138 138
139 err = xfs_da_read_buf(tp, dp, mp->m_dirdatablk, -1, bpp, 139 err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, -1, bpp,
140 XFS_DATA_FORK, &xfs_dir3_block_buf_ops); 140 XFS_DATA_FORK, &xfs_dir3_block_buf_ops);
141 if (!err && tp) 141 if (!err && tp)
142 xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF); 142 xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF);
@@ -969,7 +969,7 @@ xfs_dir2_leaf_to_block(
969 * Read the data block if we don't already have it, give up if it fails. 969 * Read the data block if we don't already have it, give up if it fails.
970 */ 970 */
971 if (!dbp) { 971 if (!dbp) {
972 error = xfs_dir3_data_read(tp, dp, mp->m_dirdatablk, -1, &dbp); 972 error = xfs_dir3_data_read(tp, dp, args->geo->datablk, -1, &dbp);
973 if (error) 973 if (error)
974 return error; 974 return error;
975 } 975 }
@@ -1034,7 +1034,7 @@ xfs_dir2_leaf_to_block(
1034 /* 1034 /*
1035 * Pitch the old leaf block. 1035 * Pitch the old leaf block.
1036 */ 1036 */
1037 error = xfs_da_shrink_inode(args, mp->m_dirleafblk, lbp); 1037 error = xfs_da_shrink_inode(args, args->geo->leafblk, lbp);
1038 if (error) 1038 if (error)
1039 return error; 1039 return error;
1040 1040