xfs: log VLOOKUP xattr nvreplace operations
If high level code wants to do a deferred xattr nvreplace operation with
the VLOOKUP flag set, we need to push this through the log. To avoid
breaking bisection in parent pointer code, we'll temporarily create a
new NVREPLACEXXX flag that connects to the VLOOKUP flag.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 24da628..95b11ec 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -424,7 +424,8 @@
return XFS_DAS_DONE;
args->attr_filter &= ~XFS_ATTR_INCOMPLETE;
- if (xfs_attr_intent_op(attr) != XFS_ATTRI_OP_FLAGS_NVREPLACE)
+ if (xfs_attr_intent_op(attr) != XFS_ATTRI_OP_FLAGS_NVREPLACE &&
+ xfs_attr_intent_op(attr) != XFS_ATTRI_OP_FLAGS_NVREPLACEXXX)
return replace_state;
/*
@@ -937,11 +938,13 @@
struct xfs_da_args *args)
{
struct xfs_attr_intent *new;
- int op_flag;
+ int op_flag = XFS_ATTRI_OP_FLAGS_REPLACE;
int error = 0;
- op_flag = args->new_namelen == 0 ? XFS_ATTRI_OP_FLAGS_REPLACE :
- XFS_ATTRI_OP_FLAGS_NVREPLACE;
+ if (args->op_flags & XFS_DA_OP_VLOOKUP)
+ op_flag = XFS_ATTRI_OP_FLAGS_NVREPLACEXXX;
+ else if (args->new_namelen > 0)
+ op_flag = XFS_ATTRI_OP_FLAGS_NVREPLACE;
error = xfs_attr_intent_init(args, op_flag, &new);
if (error)
diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h
index 8b16ae2..a1581dc 100644
--- a/libxfs/xfs_log_format.h
+++ b/libxfs/xfs_log_format.h
@@ -961,6 +961,7 @@
#define XFS_ATTRI_OP_FLAGS_NVREPLACE 4 /* Replace attr name and val */
#define XFS_ATTRI_OP_FLAGS_NVREMOVE 5 /* Remove attr w/ vlookup */
#define XFS_ATTRI_OP_FLAGS_NVSET 6 /* Set attr with w/ vlookup */
+#define XFS_ATTRI_OP_FLAGS_NVREPLACEXXX 7 /* Replace attr name and val */
#define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF /* Flags type mask */
/*
diff --git a/logprint/log_redo.c b/logprint/log_redo.c
index e2bc70f..af6c62b 100644
--- a/logprint/log_redo.c
+++ b/logprint/log_redo.c
@@ -754,7 +754,10 @@
memmove((char*)src_f, *ptr, src_len);
*ptr += src_len;
- if (xfs_attr_log_item_op(src_f) == XFS_ATTRI_OP_FLAGS_NVREPLACE) {
+ if (xfs_attr_log_item_op(src_f) == XFS_ATTRI_OP_FLAGS_NVREPLACEXXX) {
+ name_len = src_f->alfi_oldname_len;
+ newname_len = src_f->alfi_newname_len;
+ } else if (xfs_attr_log_item_op(src_f) == XFS_ATTRI_OP_FLAGS_NVREPLACE) {
name_len = src_f->alfi_oldname_len;
newname_len = src_f->alfi_newname_len;
} else {
@@ -875,7 +878,10 @@
if (xfs_attri_copy_log_format((char*)src_f, src_len, f))
goto out;
- if (xfs_attr_log_item_op(f) == XFS_ATTRI_OP_FLAGS_NVREPLACE) {
+ if (xfs_attr_log_item_op(f) == XFS_ATTRI_OP_FLAGS_NVREPLACEXXX) {
+ name_len = f->alfi_oldname_len;
+ newname_len = f->alfi_newname_len;
+ } else if (xfs_attr_log_item_op(f) == XFS_ATTRI_OP_FLAGS_NVREPLACE) {
name_len = f->alfi_oldname_len;
newname_len = f->alfi_newname_len;
} else {
