aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 01:14:11 -0400
committerDave Chinner <david@fromorbit.com>2014-06-06 01:14:11 -0400
commitd6cf13051f31bf1a54b65643d0e578b3ca2f0692 (patch)
tree135c8bfa288892dde3979bdf0ae3ef03d2627300 /fs/xfs/xfs_dir2.c
parent7dda6e8644a31c366484bbcb564ea6c6225e5963 (diff)
xfs: convert m_dirblkfsbs 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.c')
-rw-r--r--fs/xfs/xfs_dir2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index 77d6882c46b0..3fbf0110eeb3 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -146,7 +146,6 @@ xfs_da_mount(
146 146
147 /* XXX: these are to be removed as code is converted to use geo */ 147 /* XXX: these are to be removed as code is converted to use geo */
148 mp->m_dirblksize = mp->m_dir_geo->blksize; 148 mp->m_dirblksize = mp->m_dir_geo->blksize;
149 mp->m_dirblkfsbs = mp->m_dir_geo->fsbcount;
150 mp->m_dir_node_ents = mp->m_dir_geo->node_ents; 149 mp->m_dir_node_ents = mp->m_dir_geo->node_ents;
151 mp->m_dir_magicpct = mp->m_dir_geo->magicpct; 150 mp->m_dir_magicpct = mp->m_dir_geo->magicpct;
152 mp->m_attr_node_ents = mp->m_attr_geo->node_ents; 151 mp->m_attr_node_ents = mp->m_attr_geo->node_ents;
@@ -628,7 +627,7 @@ xfs_dir2_grow_inode(
628 * Set lowest possible block in the space requested. 627 * Set lowest possible block in the space requested.
629 */ 628 */
630 bno = XFS_B_TO_FSBT(mp, space * XFS_DIR2_SPACE_SIZE); 629 bno = XFS_B_TO_FSBT(mp, space * XFS_DIR2_SPACE_SIZE);
631 count = mp->m_dirblkfsbs; 630 count = args->geo->fsbcount;
632 631
633 error = xfs_da_grow_inode_int(args, &bno, count); 632 error = xfs_da_grow_inode_int(args, &bno, count);
634 if (error) 633 if (error)
@@ -719,7 +718,7 @@ xfs_dir2_shrink_inode(
719 /* 718 /*
720 * Unmap the fsblock(s). 719 * Unmap the fsblock(s).
721 */ 720 */
722 if ((error = xfs_bunmapi(tp, dp, da, mp->m_dirblkfsbs, 721 if ((error = xfs_bunmapi(tp, dp, da, args->geo->fsbcount,
723 XFS_BMAPI_METADATA, 0, args->firstblock, args->flist, 722 XFS_BMAPI_METADATA, 0, args->firstblock, args->flist,
724 &done))) { 723 &done))) {
725 /* 724 /*