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 v10 12/26] xfsprogs: Pull up xfs_attr_rmtval_invalidate
Date: Thu, 25 Jun 2020 16:28:34 -0700	[thread overview]
Message-ID: <20200625232848.14465-13-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200625232848.14465-1-allison.henderson@oracle.com>

This patch pulls xfs_attr_rmtval_invalidate out of
xfs_attr_rmtval_remove and into the calling functions.  Eventually
__xfs_attr_rmtval_remove will replace xfs_attr_rmtval_remove when we
introduce delayed attributes.  These functions are exepcted to return
-EAGAIN when they need a new transaction.  Because the invalidate does
not need a new transaction, we need to separate it from the rest of the
function that does.  This will enable __xfs_attr_rmtval_remove to
smoothly replace xfs_attr_rmtval_remove later.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 libxfs/xfs_attr.c        | 12 ++++++++++++
 libxfs/xfs_attr_remote.c |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 07ef88e..5580d61 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -670,6 +670,10 @@ xfs_attr_leaf_addname(
 		args->rmtblkcnt = args->rmtblkcnt2;
 		args->rmtvaluelen = args->rmtvaluelen2;
 		if (args->rmtblkno) {
+			error = xfs_attr_rmtval_invalidate(args);
+			if (error)
+				return error;
+
 			error = xfs_attr_rmtval_remove(args);
 			if (error)
 				return error;
@@ -1028,6 +1032,10 @@ restart:
 		args->rmtblkcnt = args->rmtblkcnt2;
 		args->rmtvaluelen = args->rmtvaluelen2;
 		if (args->rmtblkno) {
+			error = xfs_attr_rmtval_invalidate(args);
+			if (error)
+				return error;
+
 			error = xfs_attr_rmtval_remove(args);
 			if (error)
 				return error;
@@ -1153,6 +1161,10 @@ xfs_attr_node_removename(
 		if (error)
 			goto out;
 
+		error = xfs_attr_rmtval_invalidate(args);
+		if (error)
+			return error;
+
 		error = xfs_attr_rmtval_remove(args);
 		if (error)
 			goto out;
diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 52e5574..07b7193 100644
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -684,9 +684,6 @@ xfs_attr_rmtval_remove(
 
 	trace_xfs_attr_rmtval_remove(args);
 
-	error = xfs_attr_rmtval_invalidate(args);
-	if (error)
-		return error;
 	/*
 	 * Keep de-allocating extents until the remote-value region is gone.
 	 */
-- 
2.7.4


  parent reply	other threads:[~2020-06-25 23:31 UTC|newest]

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