All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v11 07/26] xfsprogs: Refactor xfs_attr_try_sf_addname
Date: Fri, 17 Jul 2020 21:33:23 -0700	[thread overview]
Message-ID: <20200718043342.6432-8-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200718043342.6432-1-allison.henderson@oracle.com>

To help pre-simplify xfs_attr_set_args, we need to hoist transaction
handling up, while modularizing the adjacent code down into helpers. In
this patch, hoist the commit in xfs_attr_try_sf_addname up into the
calling function, and also pull the attr list creation down.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
---
 libxfs/xfs_attr.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index d12cf0c..c1d1bfa 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -178,8 +178,13 @@ xfs_attr_try_sf_addname(
 	struct xfs_da_args	*args)
 {
 
-	struct xfs_mount	*mp = dp->i_mount;
-	int			error, error2;
+	int			error;
+
+	/*
+	 * Build initial attribute list (if required).
+	 */
+	if (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS)
+		xfs_attr_shortform_create(args);
 
 	error = xfs_attr_shortform_addname(args);
 	if (error == -ENOSPC)
@@ -192,12 +197,10 @@ xfs_attr_try_sf_addname(
 	if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))
 		xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
 
-	if (mp->m_flags & XFS_MOUNT_WSYNC)
+	if (dp->i_mount->m_flags & XFS_MOUNT_WSYNC)
 		xfs_trans_set_sync(args->trans);
 
-	error2 = xfs_trans_commit(args->trans);
-	args->trans = NULL;
-	return error ? error : error2;
+	return error;
 }
 
 /*
@@ -209,7 +212,7 @@ xfs_attr_set_args(
 {
 	struct xfs_inode	*dp = args->dp;
 	struct xfs_buf          *leaf_bp = NULL;
-	int			error;
+	int			error, error2 = 0;
 
 	/*
 	 * If the attribute list is non-existent or a shortform list,
@@ -220,17 +223,14 @@ xfs_attr_set_args(
 	     dp->i_d.di_anextents == 0)) {
 
 		/*
-		 * Build initial attribute list (if required).
-		 */
-		if (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS)
-			xfs_attr_shortform_create(args);
-
-		/*
 		 * Try to add the attr to the attribute list in the inode.
 		 */
 		error = xfs_attr_try_sf_addname(dp, args);
-		if (error != -ENOSPC)
-			return error;
+		if (error != -ENOSPC) {
+			error2 = xfs_trans_commit(args->trans);
+			args->trans = NULL;
+			return error ? error : error2;
+		}
 
 		/*
 		 * It won't fit in the shortform, transform to a leaf block.
-- 
2.7.4


  parent reply	other threads:[~2020-07-18  4:33 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-18  4:33 [PATCH v11 00/26] xfsprogs: Delay Ready Attributes Allison Collins
2020-07-18  4:33 ` [PATCH v11 01/26] xfs: random buffer write failure errortag Allison Collins
2020-07-18  4:33 ` [PATCH v11 02/26] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-07-18  4:33 ` [PATCH v11 03/26] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-07-18  4:33 ` [PATCH v11 04/26] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-07-18  4:33 ` [PATCH v11 05/26] xfsprogs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-07-18  4:33 ` [PATCH v11 06/26] xfsprogs: Split apart xfs_attr_leaf_addname Allison Collins
2020-07-18  4:33 ` Allison Collins [this message]
2020-07-18  4:33 ` [PATCH v11 08/26] xfsprogs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-07-18  4:33 ` [PATCH v11 09/26] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-07-18  4:33 ` [PATCH v11 10/26] xfsprogs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-07-18  4:33 ` [PATCH v11 11/26] xfsprogs: Refactor xfs_attr_rmtval_remove Allison Collins
2020-07-18  4:33 ` [PATCH v11 12/26] xfsprogs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-07-18  4:33 ` [PATCH v11 13/26] xfsprogs: Add helper function xfs_attr_node_shrink Allison Collins
2020-07-18  4:33 ` [PATCH v11 14/26] xfsprogs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-18  4:33 ` [PATCH v11 15/26] xfsprogs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-18  4:33 ` [PATCH v11 16/26] xfsprogs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-07-18  4:33 ` [PATCH v11 17/26] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-07-18  4:33 ` [PATCH v11 18/26] xfsprogs: Add remote block helper functions Allison Collins
2020-07-18  4:33 ` [PATCH v11 19/26] xfsprogs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-07-18  4:33 ` [PATCH v11 20/26] xfsprogs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-07-18  4:33 ` [PATCH v11 21/26] xfsprogs: Simplify xfs_attr_leaf_addname Allison Collins
2020-07-18  4:33 ` [PATCH v11 22/26] xfsprogs: Simplify xfs_attr_node_addname Allison Collins
2020-07-18  4:33 ` [PATCH v11 23/26] xfsprogs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-07-18  4:33 ` [PATCH v11 24/26] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-07-18  4:33 ` [PATCH v11 25/26] xfsprogs: Add delay ready attr set routines Allison Collins
2020-07-18  4:33 ` [PATCH v11 26/26] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Collins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200718043342.6432-8-allison.henderson@oracle.com \
    --to=allison.henderson@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.