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

diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
index 9cf84717a92e217137930eddfb477bd16951b398..d61110f511e0d13e18029fe517d7c6c6c22531a2 100644 (file)
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@ -72,7 +72,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
                        ret = -EFSCORRUPTED;
                        goto out_unlock;        /* xattr ondisk layout error */
                }
-               ret = -ENOATTR;
+               ret = -ENODATA;
                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);
 
                if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count)
-                       return -ENOATTR;
+                       return -ENODATA;
 
                if (it->index != pf->prefix->base_index ||
                    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))
-                       return -ENOATTR;
+                       return -ENODATA;
 
                it->infix_len = pf->infix_len;
        } else {
                if (it->index != entry.e_name_index ||
                    it->name.len != entry.e_name_len)
-                       return -ENOATTR;
+                       return -ENODATA;
 
                it->infix_len = 0;
        }
@@ -295,7 +295,7 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)
                                entry.e_name_len - processed);
                if (memcmp(it->name.name + it->infix_len + processed,
                           it->kaddr, slice))
-                       return -ENOATTR;
+                       return -ENODATA;
                it->pos += slice;
        }
 
@@ -323,7 +323,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,
                          sizeof(u32) * vi->xattr_shared_count;
        if (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;
@@ -347,7 +347,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,
                        ret = erofs_getxattr_foreach(it);
                else
                        ret = erofs_listxattr_foreach(it);
-               if ((getxattr && ret != -ENOATTR) || (!getxattr && ret))
+               if ((getxattr && ret != -ENODATA) || (!getxattr && ret))
                        break;
 
                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 erofs_sb_info *sbi = EROFS_SB(sb);
        unsigned int i;
-       int ret = -ENOATTR;
+       int ret = -ENODATA;
 
        for (i = 0; i < vi->xattr_shared_count; ++i) {
                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);
                else
                        ret = erofs_listxattr_foreach(it);
-               if ((getxattr && ret != -ENOATTR) || (!getxattr && ret))
+               if ((getxattr && ret != -ENODATA) || (!getxattr && ret))
                        break;
        }
        return ret;
@@ -403,7 +403,7 @@ int erofs_getxattr(struct inode *inode, int index, const char *name,
                                EROFS_XATTR_FILTER_SEED + index);
                hashbit &= EROFS_XATTR_FILTER_BITS - 1;
                if (vi->xattr_name_filter & (1U << hashbit))
-                       return -ENOATTR;
+                       return -ENODATA;
        }
 
        it.index = index;
@@ -419,7 +419,7 @@ int erofs_getxattr(struct inode *inode, int index, const char *name,
        it.buffer_ofs = 0;
 
        ret = erofs_xattr_iter_inline(&it, inode, true);
-       if (ret == -ENOATTR)
+       if (ret == -ENODATA)
                ret = erofs_xattr_iter_shared(&it, inode, true);
        erofs_put_metabuf(&it.buf);
        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);
 
        ret = erofs_init_inode_xattrs(inode);
-       if (ret == -ENOATTR)
+       if (ret == -ENODATA)
                return 0;
        if (ret)
                return ret;
@@ -446,9 +446,9 @@ ssize_t erofs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
        it.buffer_ofs = 0;
 
        ret = erofs_xattr_iter_inline(&it, inode, false);
-       if (!ret || ret == -ENOATTR)
+       if (!ret || ret == -ENODATA)
                ret = erofs_xattr_iter_shared(&it, inode, false);
-       if (ret == -ENOATTR)
+       if (ret == -ENODATA)
                ret = 0;
        erofs_put_metabuf(&it.buf);
        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);
        }
 
-       if (rc == -ENOATTR)
+       if (rc == -ENODATA)
                acl = NULL;
        else if (rc < 0)
                acl = ERR_PTR(rc);

diff --git a/fs/erofs/xattr.h b/fs/erofs/xattr.h
index b246cd0e135ed448ff87c6d8c24959836e7e6e4f..6317caa8413e94b4d244e175fdafca20e61c803f 100644 (file)
--- a/fs/erofs/xattr.h
+++ b/fs/erofs/xattr.h
@@ -10,9 +10,6 @@
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
 
-/* Attribute not found */
-#define ENOATTR         ENODATA
-
 #ifdef CONFIG_EROFS_FS_XATTR
 extern const struct xattr_handler erofs_xattr_user_handler;
 extern const struct xattr_handler erofs_xattr_trusted_handler;