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 v7 09/20] xfsprogs: Refactor xfs_attr_try_sf_addname
Date: Sat, 22 Feb 2020 19:05:43 -0700	[thread overview]
Message-ID: <20200223020554.1731-10-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200223020554.1731-1-allison.henderson@oracle.com>

To help pre-simplify xfs_attr_set_args, we need to hoist transacation 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>
---
 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 834fd2f..760ced0 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -226,8 +226,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)
@@ -240,12 +245,10 @@ xfs_attr_try_sf_addname(
 	if (!error && (args->name.type & ATTR_KERNOTIME) == 0)
 		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;
 }
 
 /*
@@ -257,7 +260,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,
@@ -268,17 +271,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-02-23  2:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-23  2:05 [PATCH v7 00/20] xfsprogs: Delayed Ready Attributes Allison Collins
2020-02-23  2:05 ` [PATCH v7 01/20] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2020-02-23  2:05 ` [PATCH v7 02/20] xfsprogs: Replace attribute parameters with struct xfs_name Allison Collins
2020-02-23  2:05 ` [PATCH v7 03/20] xfsprogs: Embed struct xfs_name in xfs_da_args Allison Collins
2020-02-23  2:05 ` [PATCH v7 04/20] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-02-23  2:05 ` [PATCH v7 05/20] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-02-23  2:05 ` [PATCH v7 06/20] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-02-23  2:05 ` [PATCH v7 07/20] xfsprogs: Factor out trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-02-23  2:05 ` [PATCH v7 08/20] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2020-02-23  2:05 ` Allison Collins [this message]
2020-02-23  2:05 ` [PATCH v7 10/20] xfsprogs: Factor out trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-02-23  2:05 ` [PATCH v7 11/20] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-02-23  2:05 ` [PATCH v7 12/20] xfsprogs: Factor out trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-02-23  2:05 ` [PATCH v7 13/20] xfsprogs: Add helper function xfs_attr_rmtval_unmap Allison Collins
2020-02-23  2:05 ` [PATCH v7 14/20] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-02-23  2:05 ` [PATCH v7 15/20] xfsprogs: Add delay ready attr set routines Allison Collins
2020-02-23  2:05 ` [PATCH v7 16/20] xfsprogs: Add helper function xfs_attr_node_shrink Allison Collins
2020-02-23  2:05 ` [PATCH v7 17/20] xfsprogs: Simplify xfs_attr_set_iter Allison Collins
2020-02-23  2:05 ` [PATCH v7 18/20] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-02-23  2:05 ` [PATCH v7 19/20] xfsprogs: Add remote block helper functions Allison Collins
2020-02-23  2:05 ` [PATCH v7 20/20] xfsprogs: Remove 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=20200223020554.1731-10-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.