--- initial
+++ final
@@ -1,147 +1,147 @@
 STATIC int xfs_attr_leaf_addname(struct xfs_da_args *args) {
   struct xfs_inode *dp;
   struct xfs_buf *bp;
   int retval, error, forkoff;
   trace_xfs_attr_leaf_addname(args);
   /*
    * Read the (only) block in the attribute list in.
    */
   dp = args->dp;
   args->blkno = 0;
   error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
   if (error) return error;
   /*
    * Look up the given attribute in the leaf block.  Figure out if
    * the given flags produce an error or call for an atomic rename.
    */
   retval = xfs_attr3_leaf_lookup_int(bp, args);
   if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {
     xfs_trans_brelse(args->trans, bp);
     return retval;
   } else if (retval == -EEXIST) {
     if (args->flags & ATTR_CREATE) { /* pure create op */
       xfs_trans_brelse(args->trans, bp);
       return retval;
     }
     trace_xfs_attr_leaf_replace(args);
     /* save the attribute state for later removal*/
     args->op_flags |= XFS_DA_OP_RENAME; /* an atomic rename */
     args->blkno2 = args->blkno;         /* set 2nd entry info*/
     args->index2 = args->index;
     args->rmtblkno2 = args->rmtblkno;
     args->rmtblkcnt2 = args->rmtblkcnt;
     args->rmtvaluelen2 = args->rmtvaluelen;
     /*
      * clear the remote attr state now that it is saved so that the
      * values reflect the state of the attribute we are about to
      * add, not the attribute we just found and will remove later.
      */
     args->rmtblkno = 0;
     args->rmtblkcnt = 0;
     args->rmtvaluelen = 0;
   }
   /*
    * Add the attribute to the leaf block, transitioning to a Btree
    * if required.
    */
   retval = xfs_attr3_leaf_add(bp, args);
   if (retval == -ENOSPC) {
     /*
      * Promote the attribute list to the Btree format, then
      * Commit that transaction so that the node_addname() call
      * can manage its own transactions.
      */
-    xfs_defer_init(args->trans->t_dfops, args->firstblock);
+    xfs_defer_init(NULL, args->trans->t_dfops, args->firstblock);
     error = xfs_attr3_leaf_to_node(args);
     if (error) goto out_defer_cancel;
     xfs_defer_ijoin(args->trans->t_dfops, dp);
     error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
     if (error) goto out_defer_cancel;
     /*
      * Commit the current trans (including the inode) and start
      * a new one.
      */
     error = xfs_trans_roll_inode(&args->trans, dp);
     if (error) return error;
     /*
      * Fob the whole rest of the problem off on the Btree code.
      */
     error = xfs_attr_node_addname(args);
     return error;
   }
   /*
    * Commit the transaction that added the attr name so that
    * later routines can manage their own transactions.
    */
   error = xfs_trans_roll_inode(&args->trans, dp);
   if (error) return error;
   /*
    * If there was an out-of-line value, allocate the blocks we
    * identified for its storage and copy the value.  This is done
    * after we create the attribute so that we don't overflow the
    * maximum size of a transaction and/or hit a deadlock.
    */
   if (args->rmtblkno > 0) {
     error = xfs_attr_rmtval_set(args);
     if (error) return error;
   }
   /*
    * If this is an atomic rename operation, we must "flip" the
    * incomplete flags on the "new" and "old" attribute/value pairs
    * so that one disappears and one appears atomically.  Then we
    * must remove the "old" attribute/value pair.
    */
   if (args->op_flags & XFS_DA_OP_RENAME) {
     /*
      * In a separate transaction, set the incomplete flag on the
      * "old" attr and clear the incomplete flag on the "new" attr.
      */
     error = xfs_attr3_leaf_flipflags(args);
     if (error) return error;
     /*
      * Dismantle the "old" attribute/value pair by removing
      * a "remote" value (if it exists).
      */
     args->index = args->index2;
     args->blkno = args->blkno2;
     args->rmtblkno = args->rmtblkno2;
     args->rmtblkcnt = args->rmtblkcnt2;
     args->rmtvaluelen = args->rmtvaluelen2;
     if (args->rmtblkno) {
       error = xfs_attr_rmtval_remove(args);
       if (error) return error;
     }
     /*
      * Read in the block containing the "old" attr, then
      * remove the "old" attr from that block (neat, huh!)
      */
     error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
     if (error) return error;
     xfs_attr3_leaf_remove(bp, 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->trans->t_dfops, args->firstblock);
+      xfs_defer_init(NULL, args->trans->t_dfops, args->firstblock);
       error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
       /* bp is gone due to xfs_da_shrink_inode */
       if (error) goto out_defer_cancel;
       xfs_defer_ijoin(args->trans->t_dfops, dp);
       error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
       if (error) goto out_defer_cancel;
     }
     /*
      * Commit the remove and start the next trans in series.
      */
     error = xfs_trans_roll_inode(&args->trans, dp);
   } else if (args->rmtblkno > 0) {
     /*
      * Added a "remote" value, just clear the incomplete flag.
      */
     error = xfs_attr3_leaf_clearflag(args);
   }
   return error;
 out_defer_cancel:
   xfs_defer_cancel(args->trans->t_dfops);
   return error;
 }<sep>@@
expression e1,e2,tp;
@@

-		xfs_defer_init(e1, e2);
+		xfs_defer_init(NULL, e1, e2);