[PATCH v1 13/19] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag

Allison Collins
2019-08-09T21:38:28Z

New delayed allocation routines cannot be handling
transactions so factor them up into the calling functions

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 12 ++++++++++++
libxfs/xfs_attr_leaf.c | 5 +----
2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 8e63377..8e8d058 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -824,6 +824,12 @@ xfs_attr_leaf_addname(struct xfs_da_args *args)
* Added a "remote" value, just clear the incomplete flag.
*/
error = xfs_attr3_leaf_clearflag(args);
+
+ /*
+ * Commit the flag value change and start the next trans in
+ * series.
+ */
+ error = xfs_trans_roll_inode(&args->trans, args->dp);
}
return error;
}
@@ -1181,6 +1187,12 @@ restart:
error = xfs_attr3_leaf_clearflag(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);
}
retval = error = 0;

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 049c786..c3e064a 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2721,10 +2721,7 @@ xfs_attr3_leaf_clearflag(
XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
}

- /*
- * Commit the flag value change and start the next trans in series.
- */
- return xfs_trans_roll_inode(&args->trans, args->dp);
+ return error;
}

/*
--
2.7.4