[XFS] Remove the rest of the macro-to-function indirections.

Remove the last of the macros-defined-to-static-functions.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index f7cdc28aff41..5fde1654b430 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -374,7 +374,7 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name,
                  * It won't fit in the shortform, transform to a leaf block.
                  * GROT: another possible req'mt for a double-split btree op.
                  */
-                XFS_BMAP_INIT(args.flist, args.firstblock);
+                xfs_bmap_init(args.flist, args.firstblock);
                 error = xfs_attr_shortform_to_leaf(&args);
                 if (!error) {
                         error = xfs_bmap_finish(&args.trans, args.flist,
@@ -956,7 +956,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                  * Commit that transaction so that the node_addname() call
                  * can manage its own transactions.
                  */
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 error = xfs_attr_leaf_to_node(args);
                 if (!error) {
                         error = xfs_bmap_finish(&args->trans, args->flist,
@@ -1057,7 +1057,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                  * If the result is small enough, shrink it all into the inode.
                  */
                 if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
-                        XFS_BMAP_INIT(args->flist, args->firstblock);
+                        xfs_bmap_init(args->flist, args->firstblock);
                         error = xfs_attr_leaf_to_shortform(bp, args, forkoff);
                         /* bp is gone due to xfs_da_shrink_inode */
                         if (!error) {
@@ -1135,7 +1135,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *args)
          * If the result is small enough, shrink it all into the inode.
          */
         if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 error = xfs_attr_leaf_to_shortform(bp, args, forkoff);
                 /* bp is gone due to xfs_da_shrink_inode */
                 if (!error) {
@@ -1290,7 +1290,7 @@ restart:
                          * have been a b-tree.
                          */
                         xfs_da_state_free(state);
-                        XFS_BMAP_INIT(args->flist, args->firstblock);
+                        xfs_bmap_init(args->flist, args->firstblock);
                         error = xfs_attr_leaf_to_node(args);
                         if (!error) {
                                 error = xfs_bmap_finish(&args->trans,
@@ -1331,7 +1331,7 @@ restart:
                  * in the index/blkno/rmtblkno/rmtblkcnt fields and
                  * in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.
                  */
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 error = xfs_da_split(state);
                 if (!error) {
                         error = xfs_bmap_finish(&args->trans, args->flist,
@@ -1443,7 +1443,7 @@ restart:
                  * Check to see if the tree needs to be collapsed.
                  */
                 if (retval && (state->path.active > 1)) {
-                        XFS_BMAP_INIT(args->flist, args->firstblock);
+                        xfs_bmap_init(args->flist, args->firstblock);
                         error = xfs_da_join(state);
                         if (!error) {
                                 error = xfs_bmap_finish(&args->trans,
@@ -1579,7 +1579,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
          * Check to see if the tree needs to be collapsed.
          */
         if (retval && (state->path.active > 1)) {
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 error = xfs_da_join(state);
                 if (!error) {
                         error = xfs_bmap_finish(&args->trans, args->flist,
@@ -1630,7 +1630,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
                                                        == XFS_ATTR_LEAF_MAGIC);
 
                 if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
-                        XFS_BMAP_INIT(args->flist, args->firstblock);
+                        xfs_bmap_init(args->flist, args->firstblock);
                         error = xfs_attr_leaf_to_shortform(bp, args, forkoff);
                         /* bp is gone due to xfs_da_shrink_inode */
                         if (!error) {
@@ -2069,7 +2069,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args)
                 /*
                  * Allocate a single extent, up to the size of the value.
                  */
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 nmap = 1;
                 error = xfs_bmapi(args->trans, dp, (xfs_fileoff_t)lblkno,
                                   blkcnt,
@@ -2123,7 +2123,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args)
                 /*
                  * Try to remember where we decided to put the value.
                  */
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 nmap = 1;
                 error = xfs_bmapi(NULL, dp, (xfs_fileoff_t)lblkno,
                                   args->rmtblkcnt,
@@ -2188,7 +2188,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args)
                 /*
                  * Try to remember where we decided to put the value.
                  */
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 nmap = 1;
                 error = xfs_bmapi(NULL, args->dp, (xfs_fileoff_t)lblkno,
                                         args->rmtblkcnt,
@@ -2229,7 +2229,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args)
         blkcnt = args->rmtblkcnt;
         done = 0;
         while (!done) {
-                XFS_BMAP_INIT(args->flist, args->firstblock);
+                xfs_bmap_init(args->flist, args->firstblock);
                 error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,
                                     XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,
                                     1, args->firstblock, args->flist,