xfs: rename flist/free_list to dfops

[deliverable/linux.git] / fs / xfs / libxfs / xfs_attr.c

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 66baf9747221b12ceaeae8364c58e3eac98729d8..af1ecb19121e9e8569c0ee907652405575d882c8 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -204,7 +204,7 @@ xfs_attr_set(
 {
        struct xfs_mount        *mp = dp->i_mount;
        struct xfs_da_args      args;
-       struct xfs_defer_ops    flist;
+       struct xfs_defer_ops    dfops;
        struct xfs_trans_res    tres;
        xfs_fsblock_t           firstblock;
        int                     rsvd = (flags & ATTR_ROOT) != 0;
@@ -222,7 +222,7 @@ xfs_attr_set(
        args.value = value;
        args.valuelen = valuelen;
        args.firstblock = &firstblock;
-       args.flist = &flist;
+       args.dfops = &dfops;
        args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
        args.total = xfs_attr_calc_size(&args, &local);
 
@@ -317,13 +317,13 @@ xfs_attr_set(
                 * It won't fit in the shortform, transform to a leaf block.
                 * GROT: another possible req'mt for a double-split btree op.
                 */
-               xfs_defer_init(args.flist, args.firstblock);
+               xfs_defer_init(args.dfops, args.firstblock);
                error = xfs_attr_shortform_to_leaf(&args);
                if (!error)
-                       error = xfs_defer_finish(&args.trans, args.flist, dp);
+                       error = xfs_defer_finish(&args.trans, args.dfops, dp);
                if (error) {
                        args.trans = NULL;
-                       xfs_defer_cancel(&flist);
+                       xfs_defer_cancel(&dfops);
                        goto out;
                }
 
@@ -383,7 +383,7 @@ xfs_attr_remove(
 {
        struct xfs_mount        *mp = dp->i_mount;
        struct xfs_da_args      args;
-       struct xfs_defer_ops    flist;
+       struct xfs_defer_ops    dfops;
        xfs_fsblock_t           firstblock;
        int                     error;
 
@@ -400,7 +400,7 @@ xfs_attr_remove(
                return error;
 
        args.firstblock = &firstblock;
-       args.flist = &flist;
+       args.dfops = &dfops;
 
        /*
         * we have no control over the attribute names that userspace passes us
@@ -585,13 +585,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                 * Commit that transaction so that the node_addname() call
                 * can manage its own transactions.
                 */
-               xfs_defer_init(args->flist, args->firstblock);
+               xfs_defer_init(args->dfops, args->firstblock);
                error = xfs_attr3_leaf_to_node(args);
                if (!error)
-                       error = xfs_defer_finish(&args->trans, args->flist, dp);
+                       error = xfs_defer_finish(&args->trans, args->dfops, dp);
                if (error) {
                        args->trans = NULL;
-                       xfs_defer_cancel(args->flist);
+                       xfs_defer_cancel(args->dfops);
                        return error;
                }
 
@@ -675,15 +675,15 @@ 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_defer_init(args->flist, args->firstblock);
+                       xfs_defer_init(args->dfops, args->firstblock);
                        error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                        /* bp is gone due to xfs_da_shrink_inode */
                        if (!error)
                                error = xfs_defer_finish(&args->trans,
-                                                       args->flist, dp);
+                                                       args->dfops, dp);
                        if (error) {
                                args->trans = NULL;
-                               xfs_defer_cancel(args->flist);
+                               xfs_defer_cancel(args->dfops);
                                return error;
                        }
                }
@@ -738,14 +738,14 @@ 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_defer_init(args->flist, args->firstblock);
+               xfs_defer_init(args->dfops, args->firstblock);
                error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                /* bp is gone due to xfs_da_shrink_inode */
                if (!error)
-                       error = xfs_defer_finish(&args->trans, args->flist, dp);
+                       error = xfs_defer_finish(&args->trans, args->dfops, dp);
                if (error) {
                        args->trans = NULL;
-                       xfs_defer_cancel(args->flist);
+                       xfs_defer_cancel(args->dfops);
                        return error;
                }
        }
@@ -864,14 +864,14 @@ restart:
                         */
                        xfs_da_state_free(state);
                        state = NULL;
-                       xfs_defer_init(args->flist, args->firstblock);
+                       xfs_defer_init(args->dfops, args->firstblock);
                        error = xfs_attr3_leaf_to_node(args);
                        if (!error)
                                error = xfs_defer_finish(&args->trans,
-                                                       args->flist, dp);
+                                                       args->dfops, dp);
                        if (error) {
                                args->trans = NULL;
-                               xfs_defer_cancel(args->flist);
+                               xfs_defer_cancel(args->dfops);
                                goto out;
                        }
 
@@ -892,13 +892,13 @@ restart:
                 * in the index/blkno/rmtblkno/rmtblkcnt fields and
                 * in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.
                 */
-               xfs_defer_init(args->flist, args->firstblock);
+               xfs_defer_init(args->dfops, args->firstblock);
                error = xfs_da3_split(state);
                if (!error)
-                       error = xfs_defer_finish(&args->trans, args->flist, dp);
+                       error = xfs_defer_finish(&args->trans, args->dfops, dp);
                if (error) {
                        args->trans = NULL;
-                       xfs_defer_cancel(args->flist);
+                       xfs_defer_cancel(args->dfops);
                        goto out;
                }
        } else {
@@ -991,14 +991,14 @@ restart:
                 * Check to see if the tree needs to be collapsed.
                 */
                if (retval && (state->path.active > 1)) {
-                       xfs_defer_init(args->flist, args->firstblock);
+                       xfs_defer_init(args->dfops, args->firstblock);
                        error = xfs_da3_join(state);
                        if (!error)
                                error = xfs_defer_finish(&args->trans,
-                                                       args->flist, dp);
+                                                       args->dfops, dp);
                        if (error) {
                                args->trans = NULL;
-                               xfs_defer_cancel(args->flist);
+                               xfs_defer_cancel(args->dfops);
                                goto out;
                        }
                }
@@ -1114,13 +1114,13 @@ 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_defer_init(args->flist, args->firstblock);
+               xfs_defer_init(args->dfops, args->firstblock);
                error = xfs_da3_join(state);
                if (!error)
-                       error = xfs_defer_finish(&args->trans, args->flist, dp);
+                       error = xfs_defer_finish(&args->trans, args->dfops, dp);
                if (error) {
                        args->trans = NULL;
-                       xfs_defer_cancel(args->flist);
+                       xfs_defer_cancel(args->dfops);
                        goto out;
                }
                /*
@@ -1147,15 +1147,15 @@ xfs_attr_node_removename(xfs_da_args_t *args)
                        goto out;
 
                if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
-                       xfs_defer_init(args->flist, args->firstblock);
+                       xfs_defer_init(args->dfops, args->firstblock);
                        error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                        /* bp is gone due to xfs_da_shrink_inode */
                        if (!error)
                                error = xfs_defer_finish(&args->trans,
-                                                       args->flist, dp);
+                                                       args->dfops, dp);
                        if (error) {
                                args->trans = NULL;
-                               xfs_defer_cancel(args->flist);
+                               xfs_defer_cancel(args->dfops);
                                goto out;
                        }
                } else