From: Darrick J. Wong <djwong@xxxxxxxxxx>
Burn a couple of extra source code bytes to make it clear what this does.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_log_format.h | 2 +-
fs/xfs/xfs_attr_item.c | 40 ++++++++++++++++++++--------------------
fs/xfs/xfs_attr_item.h | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index 32035786135b..8b16ae27c2fd 100644
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -117,7 +117,7 @@ struct xfs_unmount_log_format {
#define XLOG_REG_TYPE_ATTRD_FORMAT 28
#define XLOG_REG_TYPE_ATTR_NAME 29
#define XLOG_REG_TYPE_ATTR_VALUE 30
-#define XLOG_REG_TYPE_ATTR_NNAME 31
+#define XLOG_REG_TYPE_ATTR_NEWNAME 31
#define XLOG_REG_TYPE_MAX 31
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index fba6a472805d..b730f8e7a785 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -75,8 +75,8 @@ static inline struct xfs_attri_log_nameval *
xfs_attri_log_nameval_alloc(
const void *name,
unsigned int name_len,
- const void *nname,
- unsigned int nname_len,
+ const void *newname,
+ unsigned int newname_len,
const void *value,
unsigned int value_len)
{
@@ -87,25 +87,25 @@ xfs_attri_log_nameval_alloc(
* this. But kvmalloc() utterly sucks, so we use our own version.
*/
nv = xlog_kvmalloc(sizeof(struct xfs_attri_log_nameval) +
- name_len + nname_len + value_len);
+ name_len + newname_len + value_len);
nv->name.i_addr = nv + 1;
nv->name.i_len = name_len;
nv->name.i_type = XLOG_REG_TYPE_ATTR_NAME;
memcpy(nv->name.i_addr, name, name_len);
- if (nname_len) {
- nv->nname.i_addr = nv->name.i_addr + name_len;
- nv->nname.i_len = nname_len;
- memcpy(nv->nname.i_addr, nname, nname_len);
+ if (newname_len) {
+ nv->newname.i_addr = nv->name.i_addr + name_len;
+ nv->newname.i_len = newname_len;
+ memcpy(nv->newname.i_addr, newname, newname_len);
} else {
- nv->nname.i_addr = NULL;
- nv->nname.i_len = 0;
+ nv->newname.i_addr = NULL;
+ nv->newname.i_len = 0;
}
- nv->nname.i_type = XLOG_REG_TYPE_ATTR_NNAME;
+ nv->newname.i_type = XLOG_REG_TYPE_ATTR_NEWNAME;
if (value_len) {
- nv->value.i_addr = nv->name.i_addr + nname_len + name_len;
+ nv->value.i_addr = nv->name.i_addr + newname_len + name_len;
nv->value.i_len = value_len;
memcpy(nv->value.i_addr, value, value_len);
} else {
@@ -159,9 +159,9 @@ xfs_attri_item_size(
*nbytes += sizeof(struct xfs_attri_log_format) +
xlog_calc_iovec_len(nv->name.i_len);
- if (nv->nname.i_len) {
+ if (nv->newname.i_len) {
*nvecs += 1;
- *nbytes += xlog_calc_iovec_len(nv->nname.i_len);
+ *nbytes += xlog_calc_iovec_len(nv->newname.i_len);
}
if (nv->value.i_len) {
@@ -197,7 +197,7 @@ xfs_attri_item_format(
ASSERT(nv->name.i_len > 0);
attrip->attri_format.alfi_size++;
- if (nv->nname.i_len > 0)
+ if (nv->newname.i_len > 0)
attrip->attri_format.alfi_size++;
if (nv->value.i_len > 0)
@@ -208,8 +208,8 @@ xfs_attri_item_format(
sizeof(struct xfs_attri_log_format));
xlog_copy_from_iovec(lv, &vecp, &nv->name);
- if (nv->nname.i_len > 0)
- xlog_copy_from_iovec(lv, &vecp, &nv->nname);
+ if (nv->newname.i_len > 0)
+ xlog_copy_from_iovec(lv, &vecp, &nv->newname);
if (nv->value.i_len > 0)
xlog_copy_from_iovec(lv, &vecp, &nv->value);
@@ -405,7 +405,7 @@ xfs_attr_log_item(
if (xfs_attr_log_item_op(attrp) == XFS_ATTRI_OP_FLAGS_NVREPLACE) {
attrp->alfi_oldname_len = attr->xattri_nameval->name.i_len;
- attrp->alfi_newname_len = attr->xattri_nameval->nname.i_len;
+ attrp->alfi_newname_len = attr->xattri_nameval->newname.i_len;
} else {
attrp->alfi_name_len = attr->xattri_nameval->name.i_len;
}
@@ -638,8 +638,8 @@ xfs_attri_item_recover(
args->whichfork = XFS_ATTR_FORK;
args->name = nv->name.i_addr;
args->namelen = nv->name.i_len;
- args->new_name = nv->nname.i_addr;
- args->new_namelen = nv->nname.i_len;
+ args->new_name = nv->newname.i_addr;
+ args->new_namelen = nv->newname.i_len;
args->hashval = xfs_da_hashname(args->name, args->namelen);
args->value = nv->value.i_addr;
args->valuelen = nv->value.i_len;
@@ -858,7 +858,7 @@ xlog_recover_attri_commit_pass2(
}
i++;
- /* Validate the attr nname */
+ /* Validate the new attr name */
if (newname_len > 0) {
if (item->ri_buf[i].i_len != xlog_calc_iovec_len(newname_len)) {
XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/xfs_attr_item.h
index 24d4968dd6cc..e374712ba06b 100644
--- a/fs/xfs/xfs_attr_item.h
+++ b/fs/xfs/xfs_attr_item.h
@@ -13,7 +13,7 @@ struct kmem_zone;
struct xfs_attri_log_nameval {
struct xfs_log_iovec name;
- struct xfs_log_iovec nname;
+ struct xfs_log_iovec newname;
struct xfs_log_iovec value;
refcount_t refcount;
