All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v15 35/37] xfsprogs: Remove unused xfs_attr_*_args
Date: Thu, 18 Feb 2021 09:45:10 -0700	[thread overview]
Message-ID: <20210218164512.4659-36-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210218164512.4659-1-allison.henderson@oracle.com>

Remove xfs_attr_set_args, xfs_attr_remove_args, and xfs_attr_trans_roll.
These high level loops are now driven by the delayed operations code,
and can be removed.

Additionally collapse in the leaf_bp parameter of xfs_attr_set_iter
since we only have one caller that passes dac->leaf_bp

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 libxfs/defer_item.c      |  6 +--
 libxfs/xfs_attr.c        | 97 +++---------------------------------------------
 libxfs/xfs_attr.h        | 10 ++---
 libxfs/xfs_attr_remote.c |  1 -
 4 files changed, 10 insertions(+), 104 deletions(-)

diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
index ab21173..054d158 100644
--- a/libxfs/defer_item.c
+++ b/libxfs/defer_item.c
@@ -131,7 +131,6 @@ int
 xfs_trans_attr(
 	struct xfs_delattr_context	*dac,
 	struct xfs_attrd_log_item	*attrdp,
-	struct xfs_buf			**leaf_bp,
 	uint32_t			op_flags)
 {
 	struct xfs_da_args		*args = dac->da_args;
@@ -144,7 +143,7 @@ xfs_trans_attr(
 	switch (op_flags) {
 	case XFS_ATTR_OP_FLAGS_SET:
 		args->op_flags |= XFS_DA_OP_ADDNAME;
-		error = xfs_attr_set_iter(dac, leaf_bp);
+		error = xfs_attr_set_iter(dac);
 		break;
 	case XFS_ATTR_OP_FLAGS_REMOVE:
 		ASSERT(XFS_IFORK_Q((args->dp)));
@@ -216,8 +215,7 @@ xfs_attr_finish_item(
 	 */
 	dac->da_args->trans = tp;
 
-	error = xfs_trans_attr(dac, ATTRD_ITEM(done), &dac->leaf_bp,
-			       attr->xattri_op_flags);
+	error = xfs_trans_attr(dac, ATTRD_ITEM(done), attr->xattri_op_flags);
 	if (error != -EAGAIN)
 		kmem_free(attr);
 
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index e01ed6f..8f638ee 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -62,8 +62,6 @@ STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,
 				 struct xfs_da_state **state);
 STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
 STATIC int xfs_attr_refillstate(xfs_da_state_t *state);
-int xfs_attr_set_iter(struct xfs_delattr_context *dac,
-		      struct xfs_buf **leaf_bp);
 
 int
 xfs_inode_hasattr(
@@ -222,67 +220,13 @@ xfs_attr_is_shortform(
 		ip->i_afp->if_nextents == 0);
 }
 
-/*
- * Checks to see if a delayed attribute transaction should be rolled.  If so,
- * also checks for a defer finish.  Transaction is finished and rolled as
- * needed, and returns true of false if the delayed operation should continue.
- */
-STATIC int
-xfs_attr_trans_roll(
-	struct xfs_delattr_context	*dac)
-{
-	struct xfs_da_args		*args = dac->da_args;
-	int				error;
-
-	if (dac->flags & XFS_DAC_DEFER_FINISH) {
-		/*
-		 * The caller wants us to finish all the deferred ops so that we
-		 * avoid pinning the log tail with a large number of deferred
-		 * ops.
-		 */
-		dac->flags &= ~XFS_DAC_DEFER_FINISH;
-		error = xfs_defer_finish(&args->trans);
-		if (error)
-			return error;
-	} else
-		error = xfs_trans_roll_inode(&args->trans, args->dp);
-
-	return error;
-}
-
-/*
- * Set the attribute specified in @args.
- */
-int
-xfs_attr_set_args(
-	struct xfs_da_args		*args)
-{
-	struct xfs_buf			*leaf_bp = NULL;
-	int				error = 0;
-	struct xfs_delattr_context	dac = {
-		.da_args	= args,
-	};
-
-	do {
-		error = xfs_attr_set_iter(&dac, &leaf_bp);
-		if (error != -EAGAIN)
-			break;
-
-		error = xfs_attr_trans_roll(&dac);
-		if (error)
-			return error;
-	} while (true);
-
-	return error;
-}
-
 STATIC int
 xfs_attr_set_fmt(
-	struct xfs_delattr_context	*dac,
-	struct xfs_buf			**leaf_bp)
+	struct xfs_delattr_context	*dac)
 {
 	struct xfs_da_args		*args = dac->da_args;
 	struct xfs_inode		*dp = args->dp;
+	struct xfs_buf			**leaf_bp = &dac->leaf_bp;
 	int				error = 0;
 
 	/*
@@ -315,7 +259,6 @@ xfs_attr_set_fmt(
 	 * add.
 	 */
 	trace_xfs_attr_set_fmt_return(XFS_DAS_UNINIT, args->dp);
-	dac->flags |= XFS_DAC_DEFER_FINISH;
 	return -EAGAIN;
 }
 
@@ -328,10 +271,10 @@ xfs_attr_set_fmt(
  */
 int
 xfs_attr_set_iter(
-	struct xfs_delattr_context	*dac,
-	struct xfs_buf			**leaf_bp)
+	struct xfs_delattr_context	*dac)
 {
 	struct xfs_da_args              *args = dac->da_args;
+	struct xfs_buf			**leaf_bp = &dac->leaf_bp;
 	struct xfs_inode		*dp = args->dp;
 	struct xfs_buf			*bp = NULL;
 	struct xfs_da_state		*state = NULL;
@@ -343,7 +286,7 @@ xfs_attr_set_iter(
 	switch (dac->dela_state) {
 	case XFS_DAS_UNINIT:
 		if (xfs_attr_is_shortform(dp))
-			return xfs_attr_set_fmt(dac, leaf_bp);
+			return xfs_attr_set_fmt(dac);
 
 		/*
 		 * After a shortform to leaf conversion, we need to hold the
@@ -380,7 +323,6 @@ xfs_attr_set_iter(
 				 * be a node, so we'll fall down into the node
 				 * handling code below
 				 */
-				dac->flags |= XFS_DAC_DEFER_FINISH;
 				trace_xfs_attr_set_iter_return(
 					dac->dela_state, args->dp);
 				return -EAGAIN;
@@ -686,32 +628,6 @@ xfs_has_attr(
 
 /*
  * Remove the attribute specified in @args.
- */
-int
-xfs_attr_remove_args(
-	struct xfs_da_args	*args)
-{
-	int				error;
-	struct xfs_delattr_context	dac = {
-		.da_args	= args,
-	};
-
-	do {
-		error = xfs_attr_remove_iter(&dac);
-		if (error != -EAGAIN)
-			break;
-
-		error = xfs_attr_trans_roll(&dac);
-		if (error)
-			return error;
-
-	} while (true);
-
-	return error;
-}
-
-/*
- * Remove the attribute specified in @args.
  *
  * This function may return -EAGAIN to signal that the transaction needs to be
  * rolled.  Callers should continue calling this function until they receive a
@@ -1309,7 +1225,6 @@ xfs_attr_node_addname(
 			 * this. dela_state is still unset by this function at
 			 * this point.
 			 */
-			dac->flags |= XFS_DAC_DEFER_FINISH;
 			trace_xfs_attr_node_addname_return(
 					dac->dela_state, args->dp);
 			return -EAGAIN;
@@ -1324,7 +1239,6 @@ xfs_attr_node_addname(
 		error = xfs_da3_split(state);
 		if (error)
 			goto out;
-		dac->flags |= XFS_DAC_DEFER_FINISH;
 	} else {
 		/*
 		 * Addition succeeded, update Btree hashvals.
@@ -1611,7 +1525,6 @@ xfs_attr_node_removename_iter(
 			if (error)
 				goto out;
 
-			dac->flags |= XFS_DAC_DEFER_FINISH;
 			dac->dela_state = XFS_DAS_RM_SHRINK;
 			trace_xfs_attr_node_removename_iter_return(
 					dac->dela_state, args->dp);
diff --git a/libxfs/xfs_attr.h b/libxfs/xfs_attr.h
index 4abf02c..f82c0b1 100644
--- a/libxfs/xfs_attr.h
+++ b/libxfs/xfs_attr.h
@@ -393,9 +393,8 @@ enum xfs_delattr_state {
 /*
  * Defines for xfs_delattr_context.flags
  */
-#define XFS_DAC_DEFER_FINISH		0x01 /* finish the transaction */
-#define XFS_DAC_LEAF_ADDNAME_INIT	0x02 /* xfs_attr_leaf_addname init*/
-#define XFS_DAC_DELAYED_OP_INIT		0x04 /* delayed operations init*/
+#define XFS_DAC_LEAF_ADDNAME_INIT	0x01 /* xfs_attr_leaf_addname init*/
+#define XFS_DAC_DELAYED_OP_INIT		0x02 /* delayed operations init*/
 
 /*
  * Context used for keeping track of delayed attribute operations
@@ -452,11 +451,8 @@ int xfs_inode_hasattr(struct xfs_inode *ip);
 int xfs_attr_get_ilocked(struct xfs_da_args *args);
 int xfs_attr_get(struct xfs_da_args *args);
 int xfs_attr_set(struct xfs_da_args *args);
-int xfs_attr_set_args(struct xfs_da_args *args);
-int xfs_attr_set_iter(struct xfs_delattr_context *dac,
-		      struct xfs_buf **leaf_bp);
+int xfs_attr_set_iter(struct xfs_delattr_context *dac);
 int xfs_has_attr(struct xfs_da_args *args);
-int xfs_attr_remove_args(struct xfs_da_args *args);
 int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
 bool xfs_attr_namecheck(const void *name, size_t length);
 void xfs_delattr_context_init(struct xfs_delattr_context *dac,
diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index b56de36..d5c2ce7 100644
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -761,7 +761,6 @@ xfs_attr_rmtval_remove(
 	 * by the parent
 	 */
 	if (!done) {
-		dac->flags |= XFS_DAC_DEFER_FINISH;
 		trace_xfs_attr_rmtval_remove_return(dac->dela_state, args->dp);
 		return -EAGAIN;
 	}
-- 
2.7.4


  parent reply	other threads:[~2021-02-18 18:47 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 16:44 [PATCH v15 00/37] xfsprogs: Delayed Attributes Allison Henderson
2021-02-18 16:44 ` [PATCH v15 01/37] xfsprogs: fix an ABBA deadlock in xfs_rename Allison Henderson
2021-02-18 16:44 ` [PATCH v15 02/37] xfsprogs: Add helper for checking per-inode extent count overflow Allison Henderson
2021-02-18 16:44 ` [PATCH v15 03/37] xfsprogs: Check for extent overflow when trivally adding a new extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 04/37] xfsprogs: Check for extent overflow when punching a hole Allison Henderson
2021-02-18 16:44 ` [PATCH v15 05/37] xfsprogs: Check for extent overflow when adding dir entries Allison Henderson
2021-02-18 16:44 ` [PATCH v15 06/37] xfsprogs: Check for extent overflow when removing " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 07/37] xfsprogs: Check for extent overflow when renaming " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 08/37] xfsprogs: Check for extent overflow when adding/removing xattrs Allison Henderson
2021-02-18 16:44 ` [PATCH v15 09/37] xfsprogs: Check for extent overflow when writing to unwritten extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 10/37] xfsprogs: Check for extent overflow when moving extent from cow to data fork Allison Henderson
2021-02-18 16:44 ` [PATCH v15 11/37] xfsprogs: Check for extent overflow when swapping extents Allison Henderson
2021-02-18 16:44 ` [PATCH v15 12/37] xfsprogs: Introduce error injection to reduce maximum inode fork extent count Allison Henderson
2021-02-18 16:44 ` [PATCH v15 13/37] xfsprogs: Remove duplicate assert statement in xfs_bmap_btalloc() Allison Henderson
2021-02-18 16:44 ` [PATCH v15 14/37] xfsprogs: Compute bmap extent alignments in a separate function Allison Henderson
2021-02-18 16:44 ` [PATCH v15 15/37] xfsprogs: Process allocated extent " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 16/37] xfsprogs: Introduce error injection to allocate only minlen size extents for files Allison Henderson
2021-02-18 16:44 ` [PATCH v15 17/37] libxfs: expose inobtcount in xfs geometry Allison Henderson
2021-02-18 16:44 ` [PATCH v15 18/37] xfsprogs: Add helper xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 19/37] xfsprogs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-02-18 16:44 ` [PATCH v15 20/37] xfsprogs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 21/37] xfsprogs: Hoist xfs_attr_set_shortform Allison Henderson
2021-02-18 16:44 ` [PATCH v15 22/37] xfsprogs: Add helper xfs_attr_set_fmt Allison Henderson
2021-02-18 16:44 ` [PATCH v15 23/37] xfsprogs: Separate xfs_attr_node_addname and xfs_attr_node_addname_work Allison Henderson
2021-02-18 16:44 ` [PATCH v15 24/37] xfsprogs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-02-18 16:45 ` [PATCH v15 25/37] xfsprogs: Hoist xfs_attr_node_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 26/37] xfsprogs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 27/37] xfsprogs: Hoist node transaction handling Allison Henderson
2021-02-18 16:45 ` [PATCH v15 28/37] xfsprogs: Add delay ready attr remove routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 29/37] xfsprogs: Add delay ready attr set routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 30/37] xfsprogs: Add state machine tracepoints Allison Henderson
2021-02-18 16:45 ` [PATCH v15 31/37] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-02-18 16:45 ` [PATCH v15 32/37] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2021-02-18 16:45 ` [PATCH v15 33/37] xfsprogs: Skip flip flags for delayed attrs Allison Henderson
2021-02-18 16:45 ` [PATCH v15 34/37] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-02-18 16:45 ` Allison Henderson [this message]
2021-02-18 16:45 ` [PATCH v15 36/37] xfsprogs: Add delayed attributes error tag Allison Henderson
2021-02-18 16:45 ` [PATCH v15 37/37] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson

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=20210218164512.4659-36-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.