From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v4 11/17] xfsprogs: Add xfs_attr3_leaf helper functions
Date: Wed, 6 Nov 2019 18:29:39 -0700 [thread overview]
Message-ID: <20191107012945.22941-12-allison.henderson@oracle.com> (raw)
In-Reply-To: <20191107012945.22941-1-allison.henderson@oracle.com>
And new helper functions xfs_attr3_leaf_flag_is_set and
xfs_attr3_leaf_flagsflipped. These routines check to see
if xfs_attr3_leaf_setflag or xfs_attr3_leaf_flipflags have
already been run. We will need this later for delayed
attributes since routines may be recalled several times
when -EAGAIN is returned.
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr_leaf.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
libxfs/xfs_attr_leaf.h | 2 ++
2 files changed, 96 insertions(+)
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 0408632..5505a73 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2733,6 +2733,40 @@ xfs_attr3_leaf_clearflag(
}
/*
+ * Check if the INCOMPLETE flag on an entry in a leaf block is set. This
+ * function can be used to check if xfs_attr3_leaf_setflag has already been
+ * called. The INCOMPLETE flag is used during attr rename operations to mark
+ * entries that are being renamed. Since renames should be atomic, only one of
+ * them should appear as a completed attribute.
+ *
+ * isset is set to true if the flag is set or false otherwise
+ */
+int
+xfs_attr3_leaf_flag_is_set(
+ struct xfs_da_args *args,
+ bool *isset)
+{
+ struct xfs_attr_leafblock *leaf;
+ struct xfs_attr_leaf_entry *entry;
+ struct xfs_buf *bp;
+ struct xfs_inode *dp = args->dp;
+ int error = 0;
+
+ error = xfs_attr3_leaf_read(args->trans, dp, args->blkno,
+ XFS_DABUF_MAP_NOMAPPING, &bp);
+ if (error)
+ return error;
+
+ leaf = bp->b_addr;
+ entry = &xfs_attr3_leaf_entryp(leaf)[args->index];
+
+ *isset = ((entry->flags & XFS_ATTR_INCOMPLETE) != 0);
+ xfs_trans_brelse(args->trans, bp);
+
+ return 0;
+}
+
+/*
* Set the INCOMPLETE flag on an entry in a leaf block.
*/
int
@@ -2896,3 +2930,63 @@ xfs_attr3_leaf_flipflags(
return error;
}
+
+/*
+ * On a leaf entry, check to see if the INCOMPLETE flag is cleared
+ * in args->blkno/index and set in args->blkno2/index2. Note that they could be
+ * in different blocks, or in the same block. This function can be used to
+ * check if xfs_attr3_leaf_flipflags has already been called. The INCOMPLETE
+ * flag is used during attr rename operations to mark entries that are being
+ * renamed. Since renames should be atomic, only one of them should appear as a
+ * completed attribute.
+ *
+ * isflipped is set to true if flags are flipped or false otherwise
+ */
+int
+xfs_attr3_leaf_flagsflipped(
+ struct xfs_da_args *args,
+ bool *isflipped)
+{
+ struct xfs_attr_leafblock *leaf1;
+ struct xfs_attr_leafblock *leaf2;
+ struct xfs_attr_leaf_entry *entry1;
+ struct xfs_attr_leaf_entry *entry2;
+ struct xfs_buf *bp1;
+ struct xfs_buf *bp2;
+ struct xfs_inode *dp = args->dp;
+ int error = 0;
+
+ /*
+ * Read the block containing the "old" attr
+ */
+ error = xfs_attr3_leaf_read(args->trans, dp, args->blkno,
+ XFS_DABUF_MAP_NOMAPPING, &bp1);
+ if (error)
+ return error;
+
+ /*
+ * Read the block containing the "new" attr, if it is different
+ */
+ if (args->blkno2 != args->blkno) {
+ error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno2,
+ -1, &bp2);
+ if (error)
+ return error;
+ } else {
+ bp2 = bp1;
+ }
+
+ leaf1 = bp1->b_addr;
+ entry1 = &xfs_attr3_leaf_entryp(leaf1)[args->index];
+
+ leaf2 = bp2->b_addr;
+ entry2 = &xfs_attr3_leaf_entryp(leaf2)[args->index2];
+
+ *isflipped = (((entry1->flags & XFS_ATTR_INCOMPLETE) == 0) &&
+ (entry2->flags & XFS_ATTR_INCOMPLETE));
+
+ xfs_trans_brelse(args->trans, bp1);
+ xfs_trans_brelse(args->trans, bp2);
+
+ return 0;
+}
diff --git a/libxfs/xfs_attr_leaf.h b/libxfs/xfs_attr_leaf.h
index 327d1a5..5dfacae 100644
--- a/libxfs/xfs_attr_leaf.h
+++ b/libxfs/xfs_attr_leaf.h
@@ -57,7 +57,9 @@ int xfs_attr3_leaf_to_shortform(struct xfs_buf *bp,
struct xfs_da_args *args, int forkoff);
int xfs_attr3_leaf_clearflag(struct xfs_da_args *args);
int xfs_attr3_leaf_setflag(struct xfs_da_args *args);
+int xfs_attr3_leaf_flag_is_set(struct xfs_da_args *args, bool *isset);
int xfs_attr3_leaf_flipflags(struct xfs_da_args *args);
+int xfs_attr3_leaf_flagsflipped(struct xfs_da_args *args, bool *isflipped);
/*
* Routines used for growing the Btree.
--
2.7.4
next prev parent reply other threads:[~2019-11-07 1:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 1:29 [PATCH v4 00/17] xfsprogs: Delayed Ready Attributes Allison Collins
2019-11-07 1:29 ` [PATCH v4 01/17] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2019-11-07 1:29 ` [PATCH v4 02/17] xfsprogs: Replace attribute parameters with struct xfs_name Allison Collins
2019-11-07 1:29 ` [PATCH v4 03/17] xfsprogs: Embed struct xfs_name in xfs_da_args Allison Collins
2019-11-07 1:29 ` [PATCH v4 04/17] xfsprogs: Add xfs_dabuf defines Allison Collins
2019-11-07 1:29 ` [PATCH v4 05/17] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2019-11-07 1:29 ` [PATCH v4 06/17] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-11-07 1:29 ` [PATCH v4 07/17] xfsprogs: Factor up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2019-11-07 1:29 ` [PATCH v4 08/17] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2019-11-07 1:29 ` [PATCH v4 09/17] xfsprogs: Factor up commit from xfs_attr_try_sf_addname Allison Collins
2019-11-07 1:29 ` [PATCH v4 10/17] xfsprogs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-11-07 1:29 ` Allison Collins [this message]
2019-11-07 1:29 ` [PATCH v4 12/17] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2019-11-07 1:29 ` [PATCH v4 13/17] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2019-11-07 1:29 ` [PATCH v4 14/17] xfsprogs: Add delay context to xfs_da_args Allison Collins
2019-11-07 1:29 ` [PATCH v4 15/17] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2019-11-07 1:29 ` [PATCH v4 16/17] xfsprogs: Add delay ready attr remove routines Allison Collins
2019-11-07 1:29 ` [PATCH v4 17/17] xfsprogs: Add delay ready attr set routines 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=20191107012945.22941-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).