From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v1 08/19] xfsprogs: Factor out xfs_attr_leaf_addname helper
Date: Fri, 9 Aug 2019 14:37:53 -0700 [thread overview]
Message-ID: <20190809213804.32628-9-allison.henderson@oracle.com> (raw)
In-Reply-To: <20190809213804.32628-1-allison.henderson@oracle.com>
Factor out new helper function xfs_attr_leaf_try_add.
Because new delayed attribute routines cannot roll
transactions, we carve off the parts of
xfs_attr_leaf_addname that we can use. This will help
to reduce repetitive code later when we introduce
delayed attributes.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 43 +++++++++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 14 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 8b3d6a3..3b7baba 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -636,19 +636,12 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
* External routines when attribute list is one block
*========================================================================*/
-/*
- * Add a name to the leaf attribute list structure
- *
- * This leaf block cannot have a "remote" value, we only call this routine
- * if bmap_one_block() says there is only one block (ie: no remote blks).
- */
STATIC int
-xfs_attr_leaf_addname(
- struct xfs_da_args *args)
+xfs_attr_leaf_try_add(
+ struct xfs_da_args *args,
+ struct xfs_buf *bp)
{
- struct xfs_buf *bp;
- int retval, error, forkoff;
- struct xfs_inode *dp = args->dp;
+ int retval, error;
trace_xfs_attr_leaf_addname(args);
@@ -693,13 +686,35 @@ xfs_attr_leaf_addname(
retval = xfs_attr3_leaf_add(bp, args);
if (retval == -ENOSPC) {
/*
- * Promote the attribute list to the Btree format, then
- * Commit that transaction so that the node_addname() call
- * can manage its own transactions.
+ * Promote the attribute list to the Btree format,
*/
error = xfs_attr3_leaf_to_node(args);
if (error)
return error;
+ }
+ return retval;
+}
+
+
+/*
+ * Add a name to the leaf attribute list structure
+ *
+ * This leaf block cannot have a "remote" value, we only call this routine
+ * if bmap_one_block() says there is only one block (ie: no remote blks).
+ */
+STATIC int
+xfs_attr_leaf_addname(struct xfs_da_args *args)
+{
+ int retval, error, forkoff;
+ struct xfs_buf *bp = NULL;
+ struct xfs_inode *dp = args->dp;
+
+ retval = xfs_attr_leaf_try_add(args, bp);
+ if (retval == -ENOSPC) {
+ /*
+ * Commit that transaction so that the node_addname() call
+ * can manage its own transactions.
+ */
error = xfs_defer_finish(&args->trans);
if (error)
return error;
--
2.7.4
next prev parent reply other threads:[~2019-08-09 21:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 21:37 [PATCH v1 00/19] Delayed Attributes Allison Collins
2019-08-09 21:37 ` [PATCH v1 01/19] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2019-08-09 21:37 ` [PATCH v1 02/19] xfsprog: Replace attribute parameters with struct xfs_name Allison Collins
2019-08-09 21:37 ` [PATCH v1 03/19] xfsprogs: Set up infastructure for deferred attribute operations Allison Collins
2019-08-09 21:37 ` [PATCH v1 04/19] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Collins
2019-08-09 21:37 ` [PATCH v1 05/19] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2019-08-09 21:37 ` [PATCH v1 06/19] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-08-09 21:37 ` [PATCH v1 07/19] xfsprogs: Factor up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2019-08-09 21:37 ` Allison Collins [this message]
2019-08-09 21:37 ` [PATCH v1 09/19] xfsprogs: Factor up commit from xfs_attr_try_sf_addname Allison Collins
2019-08-09 21:37 ` [PATCH v1 10/19] xfsprogs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-08-09 21:37 ` [PATCH v1 11/19] xfsprogs: Add xfs_attr3_leaf helper functions Allison Collins
2019-08-09 21:37 ` [PATCH v1 12/19] xfsprogs: Factor out xfs_attr_rmtval_remove_value Allison Collins
2019-08-09 21:37 ` [PATCH v1 13/19] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2019-08-09 21:37 ` [PATCH v1 14/19] xfsprogs: Add delay context to xfs_da_args Allison Collins
2019-08-09 21:38 ` [PATCH v1 15/19] xfsprogs: Add delayed attribute routines Allison Collins
2019-08-09 21:38 ` [PATCH v1 16/19] xfsprogs: Roll delayed attr operations by returning EAGAIN Allison Collins
2019-08-09 21:38 ` [PATCH v1 17/19] xfsprogs: Enable delayed attributes Allison Collins
2019-08-09 21:38 ` [PATCH v1 18/19] xfsprogs: Add delayed attributes error tag Allison Collins
2019-08-12 16:44 ` Darrick J. Wong
2019-08-12 22:39 ` Allison Collins
2019-08-09 21:38 ` [PATCH v1 19/19] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Collins
2019-08-12 16:46 ` Darrick J. Wong
2019-08-12 23:34 ` 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=20190809213804.32628-9-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.