xfs: convert directory dablk conversion 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>

diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index 2047ef1ce8d2cfa9948417e5b8b94a6d1913767f..9a2f5532fd9fcd09ff3588d1a8ce4362aeef6492 100644 (file)
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -632,7 +632,7 @@ xfs_dir2_grow_inode(
        if (error)
                return error;
 
-       *dbp = xfs_dir2_da_to_db(mp, (xfs_dablk_t)bno);
+       *dbp = xfs_dir2_da_to_db(args->geo, (xfs_dablk_t)bno);
 
        /*
         * Update file's size if this is the data space and it grew.
@@ -713,7 +713,7 @@ xfs_dir2_shrink_inode(
        dp = args->dp;
        mp = dp->i_mount;
        tp = args->trans;
-       da = xfs_dir2_db_to_da(mp, db);
+       da = xfs_dir2_db_to_da(args->geo, db);
        /*
         * Unmap the fsblock(s).
         */

diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
index bae8b5b8d1c2c7b2be62e4527b203644c018613b..890c94033c3fe36abaa3baebe55dbb4cb586a603 100644 (file)
--- a/fs/xfs/xfs_dir2_data.c
+++ b/fs/xfs/xfs_dir2_data.c
@@ -584,8 +584,8 @@ xfs_dir3_data_init(
        /*
         * Get the buffer set up for the block.
         */
-       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, blkno), -1, &bp,
-               XFS_DATA_FORK);
+       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, blkno),
+                              -1, &bp, XFS_DATA_FORK);
        if (error)
                return error;
        bp->b_ops = &xfs_dir3_data_buf_ops;

diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index dc4ef19365b8db60fac428697e7b8f4990a2eb14..046ba4a09eaa099f8c7d6ad267ec15091f1b4951 100644 (file)
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -350,8 +350,8 @@ xfs_dir3_leaf_get_buf(
        ASSERT(bno >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET) &&
               bno < xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET));
 
-       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, bno), -1, &bp,
-                              XFS_DATA_FORK);
+       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, bno),
+                              -1, &bp, XFS_DATA_FORK);
        if (error)
                return error;
 
@@ -403,7 +403,7 @@ xfs_dir2_block_to_leaf(
        if ((error = xfs_da_grow_inode(args, &blkno))) {
                return error;
        }
-       ldb = xfs_dir2_da_to_db(mp, blkno);
+       ldb = xfs_dir2_da_to_db(args->geo, blkno);
        ASSERT(ldb == xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET));
        /*
         * Initialize the leaf block, get a buffer for it.
@@ -828,8 +828,8 @@ xfs_dir2_leaf_addname(
                 * Just read that one in.
                 */
                error = xfs_dir3_data_read(tp, dp,
-                                          xfs_dir2_db_to_da(mp, use_block),
-                                          -1, &dbp);
+                                  xfs_dir2_db_to_da(args->geo, use_block),
+                                  -1, &dbp);
                if (error) {
                        xfs_trans_brelse(tp, lbp);
                        return error;
@@ -1269,8 +1269,8 @@ xfs_dir2_leaf_lookup_int(
                        if (dbp)
                                xfs_trans_brelse(tp, dbp);
                        error = xfs_dir3_data_read(tp, dp,
-                                                  xfs_dir2_db_to_da(mp, newdb),
-                                                  -1, &dbp);
+                                          xfs_dir2_db_to_da(args->geo, newdb),
+                                          -1, &dbp);
                        if (error) {
                                xfs_trans_brelse(tp, lbp);
                                return error;
@@ -1310,8 +1310,8 @@ xfs_dir2_leaf_lookup_int(
                if (cidb != curdb) {
                        xfs_trans_brelse(tp, dbp);
                        error = xfs_dir3_data_read(tp, dp,
-                                                  xfs_dir2_db_to_da(mp, cidb),
-                                                  -1, &dbp);
+                                          xfs_dir2_db_to_da(args->geo, cidb),
+                                          -1, &dbp);
                        if (error) {
                                xfs_trans_brelse(tp, lbp);
                                return error;
@@ -1609,7 +1609,8 @@ xfs_dir2_leaf_trim_data(
        /*
         * Read the offending data block.  We need its buffer.
         */
-       error = xfs_dir3_data_read(tp, dp, xfs_dir2_db_to_da(mp, db), -1, &dbp);
+       error = xfs_dir3_data_read(tp, dp, xfs_dir2_db_to_da(args->geo, db),
+                                  -1, &dbp);
        if (error)
                return error;
 

diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 1bcaaa0ffdbd8951534a4a6fb2bed472707b8309..3b70d56f4e58c61789839f25d9fc2ed73b1a05ad 100644 (file)
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -195,17 +195,18 @@ xfs_dir2_free_try_read(
 
 static int
 xfs_dir3_free_get_buf(
-       struct xfs_trans        *tp,
-       struct xfs_inode        *dp,
+       xfs_da_args_t           *args,
        xfs_dir2_db_t           fbno,
        struct xfs_buf          **bpp)
 {
+       struct xfs_trans        *tp = args->trans;
+       struct xfs_inode        *dp = args->dp;
        struct xfs_mount        *mp = dp->i_mount;
        struct xfs_buf          *bp;
        int                     error;
        struct xfs_dir3_icfree_hdr hdr;
 
-       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, fbno),
+       error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, fbno),
                                   -1, &bp, XFS_DATA_FORK);
        if (error)
                return error;
@@ -319,7 +320,7 @@ xfs_dir2_leaf_to_node(
        /*
         * Get the buffer for the new freespace block.
         */
-       error = xfs_dir3_free_get_buf(tp, dp, fdb, &fbp);
+       error = xfs_dir3_free_get_buf(args, fdb, &fbp);
        if (error)
                return error;
 
@@ -605,7 +606,8 @@ xfs_dir2_leafn_lookup_for_addname(
                                        xfs_trans_brelse(tp, curbp);
 
                                error = xfs_dir2_free_read(tp, dp,
-                                               xfs_dir2_db_to_da(mp, newfdb),
+                                               xfs_dir2_db_to_da(args->geo,
+                                                                 newfdb),
                                                &curbp);
                                if (error)
                                        return error;
@@ -746,7 +748,8 @@ xfs_dir2_leafn_lookup_for_entry(
                                curbp = state->extrablk.bp;
                        } else {
                                error = xfs_dir3_data_read(tp, dp,
-                                               xfs_dir2_db_to_da(mp, newdb),
+                                               xfs_dir2_db_to_da(args->geo,
+                                                                 newdb),
                                                -1, &curbp);
                                if (error)
                                        return error;
@@ -1246,7 +1249,8 @@ xfs_dir2_leafn_remove(
                 * read in the free block.
                 */
                fdb = dp->d_ops->db_to_fdb(mp, db);
-               error = xfs_dir2_free_read(tp, dp, xfs_dir2_db_to_da(mp, fdb),
+               error = xfs_dir2_free_read(tp, dp,
+                                          xfs_dir2_db_to_da(args->geo, fdb),
                                           &fbp);
                if (error)
                        return error;
@@ -1336,7 +1340,7 @@ xfs_dir2_leafn_split(
        /*
         * Initialize the new leaf block.
         */
-       error = xfs_dir3_leaf_get_buf(args, xfs_dir2_da_to_db(mp, blkno),
+       error = xfs_dir3_leaf_get_buf(args, xfs_dir2_da_to_db(args->geo, blkno),
                                      &newblk->bp, XFS_DIR2_LEAFN_MAGIC);
        if (error)
                return error;
@@ -1729,7 +1733,7 @@ xfs_dir2_node_addname_int(
 
                if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK)))
                        return error;
-               lastfbno = xfs_dir2_da_to_db(mp, (xfs_dablk_t)fo);
+               lastfbno = xfs_dir2_da_to_db(args->geo, (xfs_dablk_t)fo);
                fbno = ifbno;
        }
        /*
@@ -1766,8 +1770,8 @@ xfs_dir2_node_addname_int(
                         * to avoid it.
                         */
                        error = xfs_dir2_free_try_read(tp, dp,
-                                               xfs_dir2_db_to_da(mp, fbno),
-                                               &fbp);
+                                       xfs_dir2_db_to_da(args->geo, fbno),
+                                       &fbp);
                        if (error)
                                return error;
                        if (!fbp)
@@ -1837,8 +1841,8 @@ xfs_dir2_node_addname_int(
                 */
                fbno = dp->d_ops->db_to_fdb(mp, dbno);
                error = xfs_dir2_free_try_read(tp, dp,
-                                              xfs_dir2_db_to_da(mp, fbno),
-                                              &fbp);
+                                      xfs_dir2_db_to_da(args->geo, fbno),
+                                      &fbp);
                if (error)
                        return error;
 
@@ -1878,7 +1882,7 @@ xfs_dir2_node_addname_int(
                        /*
                         * Get a buffer for the new block.
                         */
-                       error = xfs_dir3_free_get_buf(tp, dp, fbno, &fbp);
+                       error = xfs_dir3_free_get_buf(args, fbno, &fbp);
                        if (error)
                                return error;
                        free = fbp->b_addr;
@@ -1946,7 +1950,8 @@ xfs_dir2_node_addname_int(
                /*
                 * Read the data block in.
                 */
-               error = xfs_dir3_data_read(tp, dp, xfs_dir2_db_to_da(mp, dbno),
+               error = xfs_dir3_data_read(tp, dp,
+                                          xfs_dir2_db_to_da(args->geo, dbno),
                                           -1, &dbp);
                if (error)
                        return error;
@@ -2265,9 +2270,9 @@ xfs_dir2_node_trim_free(
        /*
         * Blow the block away.
         */
-       if ((error =
-           xfs_dir2_shrink_inode(args, xfs_dir2_da_to_db(mp, (xfs_dablk_t)fo),
-                   bp))) {
+       error = xfs_dir2_shrink_inode(args,
+                       xfs_dir2_da_to_db(args->geo, (xfs_dablk_t)fo), bp);
+       if (error) {
                /*
                 * Can't fail with ENOSPC since that only happens with no
                 * space reservation, when breaking up an extent into two

diff --git a/fs/xfs/xfs_dir2_priv.h b/fs/xfs/xfs_dir2_priv.h
index 683828942de127562eab7be0043dc0c0f67ea5bf..18e3086bf9332fd116efbdc646d2dc542ed9d5a7 100644 (file)
--- a/fs/xfs/xfs_dir2_priv.h
+++ b/fs/xfs/xfs_dir2_priv.h
@@ -95,9 +95,9 @@ xfs_dir2_db_off_to_byte(struct xfs_da_geometry *geo, xfs_dir2_db_t db,
  * Convert block (DB) to block (dablk)
  */
 static inline xfs_dablk_t
-xfs_dir2_db_to_da(struct xfs_mount *mp, xfs_dir2_db_t db)
+xfs_dir2_db_to_da(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
 {
-       return (xfs_dablk_t)(db << mp->m_sb.sb_dirblklog);
+       return (xfs_dablk_t)(db << (geo->blklog - geo->fsblog));
 }
 
 /*
@@ -106,7 +106,7 @@ xfs_dir2_db_to_da(struct xfs_mount *mp, xfs_dir2_db_t db)
 static inline xfs_dablk_t
 xfs_dir2_byte_to_da(struct xfs_mount *mp, xfs_dir2_off_t by)
 {
-       return xfs_dir2_db_to_da(mp, xfs_dir2_byte_to_db(mp, by));
+       return xfs_dir2_db_to_da(mp->m_dir_geo, xfs_dir2_byte_to_db(mp, by));
 }
 
 /*
@@ -124,19 +124,18 @@ xfs_dir2_db_off_to_dataptr(struct xfs_mount *mp, xfs_dir2_db_t db,
  * Convert block (dablk) to block (DB)
  */
 static inline xfs_dir2_db_t
-xfs_dir2_da_to_db(struct xfs_mount *mp, xfs_dablk_t da)
+xfs_dir2_da_to_db(struct xfs_da_geometry *geo, xfs_dablk_t da)
 {
-       return (xfs_dir2_db_t)(da >> mp->m_sb.sb_dirblklog);
+       return (xfs_dir2_db_t)(da >> (geo->blklog - geo->fsblog));
 }
 
 /*
  * Convert block (dablk) to byte offset in space
  */
 static inline xfs_dir2_off_t
-xfs_dir2_da_to_byte(struct xfs_mount *mp, xfs_dablk_t da)
+xfs_dir2_da_to_byte(struct xfs_da_geometry *geo, xfs_dablk_t da)
 {
-       return xfs_dir2_db_off_to_byte(mp->m_dir_geo,
-                                      xfs_dir2_da_to_db(mp, da), 0);
+       return xfs_dir2_db_off_to_byte(geo, xfs_dir2_da_to_db(geo, da), 0);
 }
 
 /*

diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index ec912c8f1891dede0dfee5d899fc1cf5ce266107..57e92475cb86bd892341ce9fdae8390f57e875d2 100644 (file)
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -396,14 +396,14 @@ xfs_dir2_leaf_readbuf(
         * No valid mappings, so no more data blocks.
         */
        if (!mip->map_valid) {
-               *curoff = xfs_dir2_da_to_byte(mp, mip->map_off);
+               *curoff = xfs_dir2_da_to_byte(mp->m_dir_geo, mip->map_off);
                goto out;
        }
 
        /*
         * Read the directory block starting at the first mapping.
         */
-       mip->curdb = xfs_dir2_da_to_db(mp, map->br_startoff);
+       mip->curdb = xfs_dir2_da_to_db(mp->m_dir_geo, map->br_startoff);
        error = xfs_dir3_data_read(NULL, dp, map->br_startoff,
                        map->br_blockcount >= mp->m_dirblkfsbs ?
                            XFS_FSB_TO_DADDR(mp, map->br_startblock) : -1, &bp);
@@ -536,7 +536,7 @@ xfs_dir2_leaf_getdents(
         * Force this conversion through db so we truncate the offset
         * down to get the start of the data block.
         */
-       map_info->map_off = xfs_dir2_db_to_da(mp,
+       map_info->map_off = xfs_dir2_db_to_da(mp->m_dir_geo,
                                              xfs_dir2_byte_to_db(mp, curoff));
 
        /*