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 17/20] xfsprogs: Simplify xfs_attr_set_iter
Date: Sat, 22 Feb 2020 19:05:51 -0700	[thread overview]
Message-ID: <20200223020554.1731-18-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200223020554.1731-1-allison.henderson@oracle.com>

Delayed attribute mechanics make frequent use of goto statements.  We can use this
to further simplify xfs_attr_set_iter.  Because states tend to fall between if
conditions, we can invert the if logic and jump to the goto. This helps to reduce
indentation and simplify things.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
 libxfs/xfs_attr.c | 72 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index e71099c..0635d8b 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -253,6 +253,19 @@ xfs_attr_try_sf_addname(
 }
 
 /*
+ * Check to see if the attr should be upgraded from non-existent or shortform to
+ * single-leaf-block attribute list.
+ */
+static inline bool
+xfs_attr_fmt_needs_update(
+	struct xfs_inode    *dp)
+{
+	return dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL ||
+	      (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS &&
+	      dp->i_d.di_anextents == 0);
+}
+
+/*
  * Set the attribute specified in @args.
  */
 int
@@ -341,39 +354,40 @@ xfs_attr_set_iter(
 	}
 
 	/*
-	 * If the attribute list is non-existent or a shortform list,
-	 * upgrade it to a single-leaf-block attribute list.
+	 * If the attribute list is already in leaf format, jump straight to
+	 * leaf handling.  Otherwise, try to add the attribute to the shortform
+	 * list; if there's no room then convert the list to leaf format and try
+	 * again.
 	 */
-	if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL ||
-	    (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS &&
-	     dp->i_d.di_anextents == 0)) {
-		/*
-		 * Try to add the attr to the attribute list in the inode.
-		 */
-		error = xfs_attr_try_sf_addname(dp, args);
+	if (!xfs_attr_fmt_needs_update(dp))
+		goto add_leaf;
 
-		/* Should only be 0, -EEXIST or ENOSPC */
-		if (error != -ENOSPC)
-			return error;
+	/*
+	 * Try to add the attr to the attribute list in the inode.
+	 */
+	error = xfs_attr_try_sf_addname(dp, args);
 
-		/*
-		 * It won't fit in the shortform, transform to a leaf block.
-		 * GROT: another possible req'mt for a double-split btree op.
-		 */
-		error = xfs_attr_shortform_to_leaf(args, leaf_bp);
-		if (error)
-			return error;
+	/* Should only be 0, -EEXIST or ENOSPC */
+	if (error != -ENOSPC)
+		return error;
 
-		/*
-		 * Prevent the leaf buffer from being unlocked so that a
-		 * concurrent AIL push cannot grab the half-baked leaf
-		 * buffer and run into problems with the write verifier.
-		 */
-		xfs_trans_bhold(args->trans, *leaf_bp);
-		args->dac.flags |= XFS_DAC_FINISH_TRANS;
-		args->dac.dela_state = XFS_DAS_ADD_LEAF;
-		return -EAGAIN;
-	}
+	/*
+	 * It won't fit in the shortform, transform to a leaf block.
+	 * GROT: another possible req'mt for a double-split btree op.
+	 */
+	error = xfs_attr_shortform_to_leaf(args, leaf_bp);
+	if (error)
+		return error;
+
+	/*
+	 * Prevent the leaf buffer from being unlocked so that a
+	 * concurrent AIL push cannot grab the half-baked leaf
+	 * buffer and run into problems with the write verifier.
+	 */
+	xfs_trans_bhold(args->trans, *leaf_bp);
+	args->dac.flags |= XFS_DAC_FINISH_TRANS;
+	args->dac.dela_state = XFS_DAS_ADD_LEAF;
+	return -EAGAIN;
 
 add_leaf:
 
-- 
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 ` [PATCH v7 09/20] xfsprogs: Refactor xfs_attr_try_sf_addname Allison Collins
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 ` Allison Collins [this message]
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-18-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.