superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

erofs: remove ENOATTR definition 

ENOATTR is not defined in Linux; use ENODATA instead.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20250717042317.1218597-1-hsiangkao@linux.alibaba.com
pull/1309/head
Gao Xiang 2025-07-17 12:23:17 +08:00
parent f768685427
commit 7ca972a2dc
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/erofs/xattr.c
View File

@ -72,7 +72,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
ret = -EFSCORRUPTED; ret = -EFSCORRUPTED;
goto out_unlock; /* xattr ondisk layout error */ goto out_unlock; /* xattr ondisk layout error */
} }
ret = -ENOATTR; ret = -ENODATA;
goto out_unlock; goto out_unlock;
} }
@ -266,20 +266,20 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)
(entry.e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); (entry.e_name_index & EROFS_XATTR_LONG_PREFIX_MASK);
if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count) if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count)
return -ENOATTR; return -ENODATA;
if (it->index != pf->prefix->base_index || if (it->index != pf->prefix->base_index ||
it->name.len != entry.e_name_len + pf->infix_len) it->name.len != entry.e_name_len + pf->infix_len)
return -ENOATTR; return -ENODATA;
if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len)) if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len))
return -ENOATTR; return -ENODATA;
it->infix_len = pf->infix_len; it->infix_len = pf->infix_len;
} else { } else {
if (it->index != entry.e_name_index || if (it->index != entry.e_name_index ||
it->name.len != entry.e_name_len) it->name.len != entry.e_name_len)
return -ENOATTR; return -ENODATA;
it->infix_len = 0; it->infix_len = 0;
} }
@ -295,7 +295,7 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)
entry.e_name_len - processed); entry.e_name_len - processed);
if (memcmp(it->name.name + it->infix_len + processed, if (memcmp(it->name.name + it->infix_len + processed,
it->kaddr, slice)) it->kaddr, slice))
return -ENOATTR; return -ENODATA;
it->pos += slice; it->pos += slice;
} }
@ -323,7 +323,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,
sizeof(u32) * vi->xattr_shared_count; sizeof(u32) * vi->xattr_shared_count;
if (xattr_header_sz >= vi->xattr_isize) { if (xattr_header_sz >= vi->xattr_isize) {
DBG_BUGON(xattr_header_sz > vi->xattr_isize); DBG_BUGON(xattr_header_sz > vi->xattr_isize);
return -ENOATTR; return -ENODATA;
} }
remaining = vi->xattr_isize - xattr_header_sz; remaining = vi->xattr_isize - xattr_header_sz;
@ -347,7 +347,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,
ret = erofs_getxattr_foreach(it); ret = erofs_getxattr_foreach(it);
else else
ret = erofs_listxattr_foreach(it); ret = erofs_listxattr_foreach(it);
if ((getxattr && ret != -ENOATTR) || (!getxattr && ret)) if ((getxattr && ret != -ENODATA) || (!getxattr && ret))
break; break;
it->pos = next_pos; it->pos = next_pos;
@ -362,7 +362,7 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it,
struct super_block *const sb = it->sb; struct super_block *const sb = it->sb;
struct erofs_sb_info *sbi = EROFS_SB(sb); struct erofs_sb_info *sbi = EROFS_SB(sb);
unsigned int i; unsigned int i;
int ret = -ENOATTR; int ret = -ENODATA;
for (i = 0; i < vi->xattr_shared_count; ++i) { for (i = 0; i < vi->xattr_shared_count; ++i) {
it->pos = erofs_pos(sb, sbi->xattr_blkaddr) + it->pos = erofs_pos(sb, sbi->xattr_blkaddr) +
@ -375,7 +375,7 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it,
ret = erofs_getxattr_foreach(it); ret = erofs_getxattr_foreach(it);
else else
ret = erofs_listxattr_foreach(it); ret = erofs_listxattr_foreach(it);
if ((getxattr && ret != -ENOATTR) || (!getxattr && ret)) if ((getxattr && ret != -ENODATA) || (!getxattr && ret))
break; break;
} }
return ret; return ret;
@ -403,7 +403,7 @@ int erofs_getxattr(struct inode *inode, int index, const char *name,
EROFS_XATTR_FILTER_SEED + index); EROFS_XATTR_FILTER_SEED + index);
hashbit &= EROFS_XATTR_FILTER_BITS - 1; hashbit &= EROFS_XATTR_FILTER_BITS - 1;
if (vi->xattr_name_filter & (1U << hashbit)) if (vi->xattr_name_filter & (1U << hashbit))
return -ENOATTR; return -ENODATA;
} }
it.index = index; it.index = index;
@ -419,7 +419,7 @@ int erofs_getxattr(struct inode *inode, int index, const char *name,
it.buffer_ofs = 0; it.buffer_ofs = 0;
ret = erofs_xattr_iter_inline(&it, inode, true); ret = erofs_xattr_iter_inline(&it, inode, true);
if (ret == -ENOATTR) if (ret == -ENODATA)
ret = erofs_xattr_iter_shared(&it, inode, true); ret = erofs_xattr_iter_shared(&it, inode, true);
erofs_put_metabuf(&it.buf); erofs_put_metabuf(&it.buf);
return ret ? ret : it.buffer_ofs; return ret ? ret : it.buffer_ofs;
@ -432,7 +432,7 @@ ssize_t erofs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
ret = erofs_init_inode_xattrs(inode); ret = erofs_init_inode_xattrs(inode);
if (ret == -ENOATTR) if (ret == -ENODATA)
return 0; return 0;
if (ret) if (ret)
return ret; return ret;
@ -446,9 +446,9 @@ ssize_t erofs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
it.buffer_ofs = 0; it.buffer_ofs = 0;
ret = erofs_xattr_iter_inline(&it, inode, false); ret = erofs_xattr_iter_inline(&it, inode, false);
if (!ret || ret == -ENOATTR) if (!ret || ret == -ENODATA)
ret = erofs_xattr_iter_shared(&it, inode, false); ret = erofs_xattr_iter_shared(&it, inode, false);
if (ret == -ENOATTR) if (ret == -ENODATA)
ret = 0; ret = 0;
erofs_put_metabuf(&it.buf); erofs_put_metabuf(&it.buf);
return ret ? ret : it.buffer_ofs; return ret ? ret : it.buffer_ofs;
@ -539,7 +539,7 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu)
rc = erofs_getxattr(inode, prefix, "", value, rc); rc = erofs_getxattr(inode, prefix, "", value, rc);
} }
if (rc == -ENOATTR) if (rc == -ENODATA)
acl = NULL; acl = NULL;
else if (rc < 0) else if (rc < 0)
acl = ERR_PTR(rc); acl = ERR_PTR(rc);

3
fs/erofs/xattr.h
View File

@ -10,9 +10,6 @@
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
#include <linux/xattr.h> #include <linux/xattr.h>
/* Attribute not found */
#define ENOATTR ENODATA
#ifdef CONFIG_EROFS_FS_XATTR #ifdef CONFIG_EROFS_FS_XATTR
extern const struct xattr_handler erofs_xattr_user_handler; extern const struct xattr_handler erofs_xattr_user_handler;
extern const struct xattr_handler erofs_xattr_trusted_handler; extern const struct xattr_handler erofs_xattr_trusted_handler;