From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v11 11/26] xfsprogs: Refactor xfs_attr_rmtval_remove
Date: Fri, 17 Jul 2020 21:33:27 -0700 [thread overview]
Message-ID: <20200718043342.6432-12-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200718043342.6432-1-allison.henderson@oracle.com>
Refactor xfs_attr_rmtval_remove to add helper function
__xfs_attr_rmtval_remove. We will use this later when we introduce
delayed attributes. This function will eventually replace
xfs_attr_rmtval_remove
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
libxfs/xfs_attr_remote.c | 46 ++++++++++++++++++++++++++++++++++++----------
libxfs/xfs_attr_remote.h | 1 +
2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index e09c1b6..52e5574 100644
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -680,7 +680,7 @@ xfs_attr_rmtval_remove(
xfs_dablk_t lblkno;
int blkcnt;
int error = 0;
- int done = 0;
+ int retval = 0;
trace_xfs_attr_rmtval_remove(args);
@@ -692,14 +692,10 @@ xfs_attr_rmtval_remove(
*/
lblkno = args->rmtblkno;
blkcnt = args->rmtblkcnt;
- while (!done) {
- error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,
- XFS_BMAPI_ATTRFORK, 1, &done);
- if (error)
- return error;
- error = xfs_defer_finish(&args->trans);
- if (error)
- return error;
+ do {
+ retval = __xfs_attr_rmtval_remove(args);
+ if (retval && retval != EAGAIN)
+ return retval;
/*
* Close out trans and start the next one in the chain.
@@ -707,6 +703,36 @@ xfs_attr_rmtval_remove(
error = xfs_trans_roll_inode(&args->trans, args->dp);
if (error)
return error;
- }
+ } while (retval == -EAGAIN);
+
return 0;
}
+
+/*
+ * Remove the value associated with an attribute by deleting the out-of-line
+ * buffer that it is stored on. Returns EAGAIN for the caller to refresh the
+ * transaction and re-call the function
+ */
+int
+__xfs_attr_rmtval_remove(
+ struct xfs_da_args *args)
+{
+ int error, done;
+
+ /*
+ * Unmap value blocks for this attr.
+ */
+ error = xfs_bunmapi(args->trans, args->dp, args->rmtblkno,
+ args->rmtblkcnt, XFS_BMAPI_ATTRFORK, 1, &done);
+ if (error)
+ return error;
+
+ error = xfs_defer_finish(&args->trans);
+ if (error)
+ return error;
+
+ if (!done)
+ return -EAGAIN;
+
+ return error;
+}
diff --git a/libxfs/xfs_attr_remote.h b/libxfs/xfs_attr_remote.h
index eff5f95..ee3337b 100644
--- a/libxfs/xfs_attr_remote.h
+++ b/libxfs/xfs_attr_remote.h
@@ -14,4 +14,5 @@ int xfs_attr_rmtval_remove(struct xfs_da_args *args);
int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
xfs_buf_flags_t incore_flags);
int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
+int __xfs_attr_rmtval_remove(struct xfs_da_args *args);
#endif /* __XFS_ATTR_REMOTE_H__ */
--
2.7.4
next prev parent reply other threads:[~2020-07-18 4:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 4:33 [PATCH v11 00/26] xfsprogs: Delay Ready Attributes Allison Collins
2020-07-18 4:33 ` [PATCH v11 01/26] xfs: random buffer write failure errortag Allison Collins
2020-07-18 4:33 ` [PATCH v11 02/26] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-07-18 4:33 ` [PATCH v11 03/26] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-07-18 4:33 ` [PATCH v11 04/26] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-07-18 4:33 ` [PATCH v11 05/26] xfsprogs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-07-18 4:33 ` [PATCH v11 06/26] xfsprogs: Split apart xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 07/26] xfsprogs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 08/26] xfsprogs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-07-18 4:33 ` [PATCH v11 09/26] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-07-18 4:33 ` [PATCH v11 10/26] xfsprogs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-07-18 4:33 ` Allison Collins [this message]
2020-07-18 4:33 ` [PATCH v11 12/26] xfsprogs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-07-18 4:33 ` [PATCH v11 13/26] xfsprogs: Add helper function xfs_attr_node_shrink Allison Collins
2020-07-18 4:33 ` [PATCH v11 14/26] xfsprogs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-18 4:33 ` [PATCH v11 15/26] xfsprogs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-18 4:33 ` [PATCH v11 16/26] xfsprogs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-07-18 4:33 ` [PATCH v11 17/26] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-07-18 4:33 ` [PATCH v11 18/26] xfsprogs: Add remote block helper functions Allison Collins
2020-07-18 4:33 ` [PATCH v11 19/26] xfsprogs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-07-18 4:33 ` [PATCH v11 20/26] xfsprogs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-07-18 4:33 ` [PATCH v11 21/26] xfsprogs: Simplify xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 22/26] xfsprogs: Simplify xfs_attr_node_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 23/26] xfsprogs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 24/26] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-07-18 4:33 ` [PATCH v11 25/26] xfsprogs: Add delay ready attr set routines Allison Collins
2020-07-18 4:33 ` [PATCH v11 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=20200718043342.6432-12-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).