1 files changed, 8 insertions, 20 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;
 }
 
 /*