On Fri 26-04-24 18:20:15, Christian Göttsche wrote: > From: Christian Göttsche <cgzones@xxxxxxxxxxxxxx> > > 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@xxxxxxxxxx> > Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@xxxxxxx> Honza > --- > v3: added based on feedback > --- > fs/internal.h | 8 ++++---- > fs/xattr.c | 10 +++++----- > io_uring/xattr.c | 2 +- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/fs/internal.h b/fs/internal.h > index 7ca738904e34..1caa6a8f666f 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -260,7 +260,7 @@ struct xattr_name { > char name[XATTR_NAME_MAX + 1]; > }; > > -struct xattr_ctx { > +struct kernel_xattr_ctx { > /* Value of attribute */ > union { > const void __user *cvalue; > @@ -276,11 +276,11 @@ struct xattr_ctx { > > ssize_t do_getxattr(struct mnt_idmap *idmap, > struct dentry *d, > - struct xattr_ctx *ctx); > + struct kernel_xattr_ctx *ctx); > > -int setxattr_copy(const char __user *name, struct xattr_ctx *ctx); > +int setxattr_copy(const char __user *name, struct kernel_xattr_ctx *ctx); > int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry, > - struct xattr_ctx *ctx); > + struct kernel_xattr_ctx *ctx); > int may_write_xattr(struct mnt_idmap *idmap, struct inode *inode); > > #ifdef CONFIG_FS_POSIX_ACL > diff --git a/fs/xattr.c b/fs/xattr.c > index f8b643f91a98..941aab719da0 100644 > --- a/fs/xattr.c > +++ b/fs/xattr.c > @@ -590,7 +590,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); > * Extended attribute SET operations > */ > > -int setxattr_copy(const char __user *name, struct xattr_ctx *ctx) > +int setxattr_copy(const char __user *name, struct kernel_xattr_ctx *ctx) > { > int error; > > @@ -620,7 +620,7 @@ int setxattr_copy(const char __user *name, struct xattr_ctx *ctx) > } > > int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry, > - struct xattr_ctx *ctx) > + struct kernel_xattr_ctx *ctx) > { > if (is_posix_acl_xattr(ctx->kname->name)) > return do_set_acl(idmap, dentry, ctx->kname->name, > @@ -636,7 +636,7 @@ setxattr(struct mnt_idmap *idmap, struct dentry *d, > int flags) > { > struct xattr_name kname; > - struct xattr_ctx ctx = { > + struct kernel_xattr_ctx ctx = { > .cvalue = value, > .kvalue = NULL, > .size = size, > @@ -719,7 +719,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name, > */ > ssize_t > do_getxattr(struct mnt_idmap *idmap, struct dentry *d, > - struct xattr_ctx *ctx) > + struct kernel_xattr_ctx *ctx) > { > ssize_t error; > char *kname = ctx->kname->name; > @@ -754,7 +754,7 @@ getxattr(struct mnt_idmap *idmap, struct dentry *d, > { > ssize_t error; > struct xattr_name kname; > - struct xattr_ctx ctx = { > + struct kernel_xattr_ctx ctx = { > .value = value, > .kvalue = NULL, > .size = size, > diff --git a/io_uring/xattr.c b/io_uring/xattr.c > index 44905b82eea8..28b8f7b1af7c 100644 > --- a/io_uring/xattr.c > +++ b/io_uring/xattr.c > @@ -18,7 +18,7 @@ > > struct io_xattr { > struct file *file; > - struct xattr_ctx ctx; > + struct kernel_xattr_ctx ctx; > struct filename *filename; > }; > > -- > 2.43.0 > -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR