From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v11 18/26] xfsprogs: Add remote block helper functions
Date: Fri, 17 Jul 2020 21:33:34 -0700 [thread overview]
Message-ID: <20200718043342.6432-19-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200718043342.6432-1-allison.henderson@oracle.com>
This patch adds two new helper functions xfs_attr_store_rmt_blk and
xfs_attr_restore_rmt_blk. These two helpers assist to remove redundant
code associated with storing and retrieving remote blocks during the
attr set operations.
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxfs/xfs_attr.c | 50 ++++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index ded489a..25f5572 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -564,6 +564,30 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
* External routines when attribute list is one block
*========================================================================*/
+/* Store info about a remote block */
+STATIC void
+xfs_attr_save_rmt_blk(
+ struct xfs_da_args *args)
+{
+ args->blkno2 = args->blkno;
+ args->index2 = args->index;
+ args->rmtblkno2 = args->rmtblkno;
+ args->rmtblkcnt2 = args->rmtblkcnt;
+ args->rmtvaluelen2 = args->rmtvaluelen;
+}
+
+/* Set stored info about a remote block */
+STATIC void
+xfs_attr_restore_rmt_blk(
+ struct xfs_da_args *args)
+{
+ args->blkno = args->blkno2;
+ args->index = args->index2;
+ args->rmtblkno = args->rmtblkno2;
+ args->rmtblkcnt = args->rmtblkcnt2;
+ args->rmtvaluelen = args->rmtvaluelen2;
+}
+
/*
* Tries to add an attribute to an inode in leaf form
*
@@ -598,11 +622,7 @@ xfs_attr_leaf_try_add(
/* save the attribute state for later removal*/
args->op_flags |= XFS_DA_OP_RENAME; /* an atomic rename */
- args->blkno2 = args->blkno; /* set 2nd entry info*/
- args->index2 = args->index;
- args->rmtblkno2 = args->rmtblkno;
- args->rmtblkcnt2 = args->rmtblkcnt;
- args->rmtvaluelen2 = args->rmtvaluelen;
+ xfs_attr_save_rmt_blk(args);
/*
* clear the remote attr state now that it is saved so that the
@@ -701,11 +721,8 @@ xfs_attr_leaf_addname(
* Dismantle the "old" attribute/value pair by removing
* a "remote" value (if it exists).
*/
- args->index = args->index2;
- args->blkno = args->blkno2;
- args->rmtblkno = args->rmtblkno2;
- args->rmtblkcnt = args->rmtblkcnt2;
- args->rmtvaluelen = args->rmtvaluelen2;
+ xfs_attr_restore_rmt_blk(args);
+
if (args->rmtblkno) {
error = xfs_attr_rmtval_invalidate(args);
if (error)
@@ -924,11 +941,7 @@ restart:
/* save the attribute state for later removal*/
args->op_flags |= XFS_DA_OP_RENAME; /* atomic rename op */
- args->blkno2 = args->blkno; /* set 2nd entry info*/
- args->index2 = args->index;
- args->rmtblkno2 = args->rmtblkno;
- args->rmtblkcnt2 = args->rmtblkcnt;
- args->rmtvaluelen2 = args->rmtvaluelen;
+ xfs_attr_save_rmt_blk(args);
/*
* clear the remote attr state now that it is saved so that the
@@ -1040,11 +1053,8 @@ restart:
* Dismantle the "old" attribute/value pair by removing
* a "remote" value (if it exists).
*/
- args->index = args->index2;
- args->blkno = args->blkno2;
- args->rmtblkno = args->rmtblkno2;
- args->rmtblkcnt = args->rmtblkcnt2;
- args->rmtvaluelen = args->rmtvaluelen2;
+ xfs_attr_restore_rmt_blk(args);
+
if (args->rmtblkno) {
error = xfs_attr_rmtval_invalidate(args);
if (error)
--
2.7.4
next prev parent reply other threads:[~2020-07-18 4:34 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 ` [PATCH v11 11/26] xfsprogs: Refactor xfs_attr_rmtval_remove Allison Collins
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 ` Allison Collins [this message]
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-19-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).