aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2_data.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_data.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_data.c')
-rw-r--r--fs/xfs/xfs_dir2_data.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
index d355ec7d35cd..6c23f86e0148 100644
--- a/fs/xfs/xfs_dir2_data.c
+++ b/fs/xfs/xfs_dir2_data.c
@@ -63,8 +63,10 @@ __xfs_dir3_data_check(
63 int stale; /* count of stale leaves */ 63 int stale; /* count of stale leaves */
64 struct xfs_name name; 64 struct xfs_name name;
65 const struct xfs_dir_ops *ops; 65 const struct xfs_dir_ops *ops;
66 struct xfs_da_geometry *geo;
66 67
67 mp = bp->b_target->bt_mount; 68 mp = bp->b_target->bt_mount;
69 geo = mp->m_dir_geo;
68 70
69 /* 71 /*
70 * We can be passed a null dp here from a verifier, so we need to go the 72 * We can be passed a null dp here from a verifier, so we need to go the
@@ -172,10 +174,9 @@ __xfs_dir3_data_check(
172 lastfree = 0; 174 lastfree = 0;
173 if (hdr->magic == cpu_to_be32(XFS_DIR2_BLOCK_MAGIC) || 175 if (hdr->magic == cpu_to_be32(XFS_DIR2_BLOCK_MAGIC) ||
174 hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC)) { 176 hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC)) {
175 addr = xfs_dir2_db_off_to_dataptr(mp->m_dir_geo, 177 addr = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
176 mp->m_dirdatablk, 178 (xfs_dir2_data_aoff_t)
177 (xfs_dir2_data_aoff_t) 179 ((char *)dep - (char *)hdr));
178 ((char *)dep - (char *)hdr));
179 name.name = dep->name; 180 name.name = dep->name;
180 name.len = dep->namelen; 181 name.len = dep->namelen;
181 hash = mp->m_dirnameops->hashname(&name); 182 hash = mp->m_dirnameops->hashname(&name);