Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Gao Xiang 7ca972a2 f7686854

+16 -19
+16 -16
fs/erofs/xattr.c
··· 72 72 ret = -EFSCORRUPTED; 73 73 goto out_unlock; /* xattr ondisk layout error */ 74 74 } 75 - ret = -ENOATTR; 75 + ret = -ENODATA; 76 76 goto out_unlock; 77 77 } 78 78 ··· 266 266 (entry.e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); 267 267 268 268 if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count) 269 - return -ENOATTR; 269 + return -ENODATA; 270 270 271 271 if (it->index != pf->prefix->base_index || 272 272 it->name.len != entry.e_name_len + pf->infix_len) 273 - return -ENOATTR; 273 + return -ENODATA; 274 274 275 275 if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len)) 276 - return -ENOATTR; 276 + return -ENODATA; 277 277 278 278 it->infix_len = pf->infix_len; 279 279 } else { 280 280 if (it->index != entry.e_name_index || 281 281 it->name.len != entry.e_name_len) 282 - return -ENOATTR; 282 + return -ENODATA; 283 283 284 284 it->infix_len = 0; 285 285 } ··· 295 295 entry.e_name_len - processed); 296 296 if (memcmp(it->name.name + it->infix_len + processed, 297 297 it->kaddr, slice)) 298 - return -ENOATTR; 298 + return -ENODATA; 299 299 it->pos += slice; 300 300 } 301 301 ··· 323 323 sizeof(u32) * vi->xattr_shared_count; 324 324 if (xattr_header_sz >= vi->xattr_isize) { 325 325 DBG_BUGON(xattr_header_sz > vi->xattr_isize); 326 - return -ENOATTR; 326 + return -ENODATA; 327 327 } 328 328 329 329 remaining = vi->xattr_isize - xattr_header_sz; ··· 347 347 ret = erofs_getxattr_foreach(it); 348 348 else 349 349 ret = erofs_listxattr_foreach(it); 350 - if ((getxattr && ret != -ENOATTR) || (!getxattr && ret)) 350 + if ((getxattr && ret != -ENODATA) || (!getxattr && ret)) 351 351 break; 352 352 353 353 it->pos = next_pos; ··· 362 362 struct super_block *const sb = it->sb; 363 363 struct erofs_sb_info *sbi = EROFS_SB(sb); 364 364 unsigned int i; 365 - int ret = -ENOATTR; 365 + int ret = -ENODATA; 366 366 367 367 for (i = 0; i < vi->xattr_shared_count; ++i) { 368 368 it->pos = erofs_pos(sb, sbi->xattr_blkaddr) + ··· 375 375 ret = erofs_getxattr_foreach(it); 376 376 else 377 377 ret = erofs_listxattr_foreach(it); 378 - if ((getxattr && ret != -ENOATTR) || (!getxattr && ret)) 378 + if ((getxattr && ret != -ENODATA) || (!getxattr && ret)) 379 379 break; 380 380 } 381 381 return ret; ··· 403 403 EROFS_XATTR_FILTER_SEED + index); 404 404 hashbit &= EROFS_XATTR_FILTER_BITS - 1; 405 405 if (vi->xattr_name_filter & (1U << hashbit)) 406 - return -ENOATTR; 406 + return -ENODATA; 407 407 } 408 408 409 409 it.index = index; ··· 419 419 it.buffer_ofs = 0; 420 420 421 421 ret = erofs_xattr_iter_inline(&it, inode, true); 422 - if (ret == -ENOATTR) 422 + if (ret == -ENODATA) 423 423 ret = erofs_xattr_iter_shared(&it, inode, true); 424 424 erofs_put_metabuf(&it.buf); 425 425 return ret ? ret : it.buffer_ofs; ··· 432 432 struct inode *inode = d_inode(dentry); 433 433 434 434 ret = erofs_init_inode_xattrs(inode); 435 - if (ret == -ENOATTR) 435 + if (ret == -ENODATA) 436 436 return 0; 437 437 if (ret) 438 438 return ret; ··· 446 446 it.buffer_ofs = 0; 447 447 448 448 ret = erofs_xattr_iter_inline(&it, inode, false); 449 - if (!ret || ret == -ENOATTR) 449 + if (!ret || ret == -ENODATA) 450 450 ret = erofs_xattr_iter_shared(&it, inode, false); 451 - if (ret == -ENOATTR) 451 + if (ret == -ENODATA) 452 452 ret = 0; 453 453 erofs_put_metabuf(&it.buf); 454 454 return ret ? ret : it.buffer_ofs; ··· 539 539 rc = erofs_getxattr(inode, prefix, "", value, rc); 540 540 } 541 541 542 - if (rc == -ENOATTR) 542 + if (rc == -ENODATA) 543 543 acl = NULL; 544 544 else if (rc < 0) 545 545 acl = ERR_PTR(rc);
-3
fs/erofs/xattr.h
··· 10 10 #include <linux/posix_acl_xattr.h> 11 11 #include <linux/xattr.h> 12 12 13 - /* Attribute not found */ 14 - #define ENOATTR ENODATA 15 - 16 13 #ifdef CONFIG_EROFS_FS_XATTR 17 14 extern const struct xattr_handler erofs_xattr_user_handler; 18 15 extern const struct xattr_handler erofs_xattr_trusted_handler;