fs: rename struct xattr_ctx to kernel_xattr_ctx

Rename the struct xattr_ctx to increase distinction with the about to be
added user API struct xattr_args.

No functional change.

Suggested-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Link: https://lore.kernel.org/r/20240426162042.191916-2-cgoettsche@seltendoof.de
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by

Christian Göttsche and committed by

Al Viro 2 years ago 537c7662 a7187437

+11 -11

3 changed files

expand all

internal.h

xattr.c

io_uring

xattr.c

+4 -4

fs/internal.h

··· 267 267 char name[XATTR_NAME_MAX + 1]; 268 268 }; 269 269 270 - struct xattr_ctx { 270 + struct kernel_xattr_ctx { 271 271 /* Value of attribute */ 272 272 union { 273 273 const void __user *cvalue; ··· 283 283 284 284 ssize_t do_getxattr(struct mnt_idmap *idmap, 285 285 struct dentry *d, 286 - struct xattr_ctx *ctx); 286 + struct kernel_xattr_ctx *ctx); 287 287 288 - int setxattr_copy(const char __user *name, struct xattr_ctx *ctx); 288 + int setxattr_copy(const char __user *name, struct kernel_xattr_ctx *ctx); 289 289 int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry, 290 - struct xattr_ctx *ctx); 290 + struct kernel_xattr_ctx *ctx); 291 291 int may_write_xattr(struct mnt_idmap *idmap, struct inode *inode); 292 292 293 293 #ifdef CONFIG_FS_POSIX_ACL

+6 -6

fs/xattr.c

··· 590 590 * Extended attribute SET operations 591 591 */ 592 592 593 - int setxattr_copy(const char __user *name, struct xattr_ctx *ctx) 593 + int setxattr_copy(const char __user *name, struct kernel_xattr_ctx *ctx) 594 594 { 595 595 int error; 596 596 ··· 620 620 } 621 621 622 622 int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry, 623 - struct xattr_ctx *ctx) 623 + struct kernel_xattr_ctx *ctx) 624 624 { 625 625 if (is_posix_acl_xattr(ctx->kname->name)) 626 626 return do_set_acl(idmap, dentry, ctx->kname->name, ··· 635 635 size_t size, int flags, unsigned int lookup_flags) 636 636 { 637 637 struct xattr_name kname; 638 - struct xattr_ctx ctx = { 638 + struct kernel_xattr_ctx ctx = { 639 639 .cvalue = value, 640 640 .kvalue = NULL, 641 641 .size = size, ··· 687 687 const void __user *,value, size_t, size, int, flags) 688 688 { 689 689 struct xattr_name kname; 690 - struct xattr_ctx ctx = { 690 + struct kernel_xattr_ctx ctx = { 691 691 .cvalue = value, 692 692 .kvalue = NULL, 693 693 .size = size, ··· 720 720 */ 721 721 ssize_t 722 722 do_getxattr(struct mnt_idmap *idmap, struct dentry *d, 723 - struct xattr_ctx *ctx) 723 + struct kernel_xattr_ctx *ctx) 724 724 { 725 725 ssize_t error; 726 726 char *kname = ctx->kname->name; ··· 755 755 { 756 756 ssize_t error; 757 757 struct xattr_name kname; 758 - struct xattr_ctx ctx = { 758 + struct kernel_xattr_ctx ctx = { 759 759 .value = value, 760 760 .kvalue = NULL, 761 761 .size = size,

+1 -1

io_uring/xattr.c

··· 18 18 19 19 struct io_xattr { 20 20 struct file *file; 21 - struct xattr_ctx ctx; 21 + struct kernel_xattr_ctx ctx; 22 22 struct filename *filename; 23 23 }; 24 24

Configure Feed

Configure Feed