xfs: Pull up trans handling in xfs_attr3_leaf_flipflags

Since delayed operations cannot roll transactions, pull up the
transaction handling into the calling function

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 1618efda033232e79c3a8daade00368aa7fe81e8..7912e23ff901777fec7c0a6c7a1452d446a58888 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -620,6 +620,13 @@ xfs_attr_leaf_addname(
                 * "old" attr and clear the incomplete flag on the "new" attr.
                 */
                error = xfs_attr3_leaf_flipflags(args);
+               if (error)
+                       return error;
+               /*
+                * Commit the flag value change and start the next trans in
+                * series.
+                */
+               error = xfs_trans_roll_inode(&args->trans, args->dp);
                if (error)
                        return error;
 
@@ -961,6 +968,13 @@ restart:
                 * "old" attr and clear the incomplete flag on the "new" attr.
                 */
                error = xfs_attr3_leaf_flipflags(args);
+               if (error)
+                       goto out;
+               /*
+                * Commit the flag value change and start the next trans in
+                * series
+                */
+               error = xfs_trans_roll_inode(&args->trans, args->dp);
                if (error)
                        goto out;
 

diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 7ec757bb3b2d3615b666a74f971a972fc345071e..906049db57e443bf2d79122d78a26c7300219a0f 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -2951,10 +2951,5 @@ xfs_attr3_leaf_flipflags(
                         XFS_DA_LOGRANGE(leaf2, name_rmt, sizeof(*name_rmt)));
        }
 
-       /*
-        * Commit the flag value change and start the next trans in series.
-        */
-       error = xfs_trans_roll_inode(&args->trans, args->dp);
-
-       return error;
+       return 0;
 }