xfs: remove last of unnecessary xfs_defer_cancel() callers

Now that deferred operations are completely managed via
transactions, it's no longer necessary to cancel the dfops in error
paths that already cancel the associated transaction. There are a
few such calls lingering throughout the codebase.

Remove all remaining unnecessary calls to xfs_defer_cancel(). This
leaves xfs_defer_cancel() calls in two places. The first is the call
in the transaction cancel path itself, which facilitates this patch.
The second is made via the xfs_defer_finish() error path to provide
consistent error semantics with transaction commit. For example,
xfs_trans_commit() expects an xfs_defer_finish() failure to clean up
the dfops structure before it returns.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

2 files changed, 10 insertions, 28 deletions

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 1e671d4eb6fa..c6299f82a6e4 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -587,7 +587,7 @@ xfs_attr_leaf_addname(
                  */
                 error = xfs_attr3_leaf_to_node(args);
                 if (error)
-                        goto out_defer_cancel;
+                        return error;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         return error;
@@ -675,7 +675,7 @@ xfs_attr_leaf_addname(
                         error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                         /* bp is gone due to xfs_da_shrink_inode */
                         if (error)
-                                goto out_defer_cancel;
+                                return error;
                         error = xfs_defer_finish(&args->trans);
                         if (error)
                                 return error;
@@ -693,9 +693,6 @@ xfs_attr_leaf_addname(
                 error = xfs_attr3_leaf_clearflag(args);
         }
         return error;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        return error;
 }
 
 /*
@@ -738,15 +735,12 @@ xfs_attr_leaf_removename(
                 error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                 /* bp is gone due to xfs_da_shrink_inode */
                 if (error)
-                        goto out_defer_cancel;
+                        return error;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         return error;
         }
         return 0;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        return error;
 }
 
 /*
@@ -864,7 +858,7 @@ restart:
                         state = NULL;
                         error = xfs_attr3_leaf_to_node(args);
                         if (error)
-                                goto out_defer_cancel;
+                                goto out;
                         error = xfs_defer_finish(&args->trans);
                         if (error)
                                 goto out;
@@ -888,7 +882,7 @@ restart:
                  */
                 error = xfs_da3_split(state);
                 if (error)
-                        goto out_defer_cancel;
+                        goto out;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         goto out;
@@ -984,7 +978,7 @@ restart:
                 if (retval && (state->path.active > 1)) {
                         error = xfs_da3_join(state);
                         if (error)
-                                goto out_defer_cancel;
+                                goto out;
                         error = xfs_defer_finish(&args->trans);
                         if (error)
                                 goto out;
@@ -1013,9 +1007,6 @@ out:
         if (error)
                 return error;
         return retval;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        goto out;
 }
 
 /*
@@ -1107,7 +1098,7 @@ xfs_attr_node_removename(
         if (retval && (state->path.active > 1)) {
                 error = xfs_da3_join(state);
                 if (error)
-                        goto out_defer_cancel;
+                        goto out;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         goto out;
@@ -1138,7 +1129,7 @@ xfs_attr_node_removename(
                         error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
                         /* bp is gone due to xfs_da_shrink_inode */
                         if (error)
-                                goto out_defer_cancel;
+                                goto out;
                         error = xfs_defer_finish(&args->trans);
                         if (error)
                                 goto out;
@@ -1150,9 +1141,6 @@ xfs_attr_node_removename(
 out:
         xfs_da_state_free(state);
         return error;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        goto out;
 }
 
 /*
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index af094063e402..d89363c6b523 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -485,7 +485,7 @@ xfs_attr_rmtval_set(
                                   blkcnt, XFS_BMAPI_ATTRFORK, args->total, &map,
                                   &nmap);
                 if (error)
-                        goto out_defer_cancel;
+                        return error;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         return error;
@@ -553,9 +553,6 @@ xfs_attr_rmtval_set(
         }
         ASSERT(valuelen == 0);
         return 0;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        return error;
 }
 
 /*
@@ -625,7 +622,7 @@ xfs_attr_rmtval_remove(
                 error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,
                                     XFS_BMAPI_ATTRFORK, 1, &done);
                 if (error)
-                        goto out_defer_cancel;
+                        return error;
                 error = xfs_defer_finish(&args->trans);
                 if (error)
                         return error;
@@ -638,7 +635,4 @@ xfs_attr_rmtval_remove(
                         return error;
         }
         return 0;
-out_defer_cancel:
-        xfs_defer_cancel(args->trans);
-        return error;
 }