Skip to content

Commit 537c766

Browse files
cgzonesAl Viro
authored andcommitted
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>
1 parent a718743 commit 537c766

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

fs/internal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ struct xattr_name {
267267
char name[XATTR_NAME_MAX + 1];
268268
};
269269

270-
struct xattr_ctx {
270+
struct kernel_xattr_ctx {
271271
/* Value of attribute */
272272
union {
273273
const void __user *cvalue;
@@ -283,11 +283,11 @@ struct xattr_ctx {
283283

284284
ssize_t do_getxattr(struct mnt_idmap *idmap,
285285
struct dentry *d,
286-
struct xattr_ctx *ctx);
286+
struct kernel_xattr_ctx *ctx);
287287

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);
289289
int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
290-
struct xattr_ctx *ctx);
290+
struct kernel_xattr_ctx *ctx);
291291
int may_write_xattr(struct mnt_idmap *idmap, struct inode *inode);
292292

293293
#ifdef CONFIG_FS_POSIX_ACL

fs/xattr.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
590590
* Extended attribute SET operations
591591
*/
592592

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)
594594
{
595595
int error;
596596

@@ -620,7 +620,7 @@ int setxattr_copy(const char __user *name, struct xattr_ctx *ctx)
620620
}
621621

622622
int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
623-
struct xattr_ctx *ctx)
623+
struct kernel_xattr_ctx *ctx)
624624
{
625625
if (is_posix_acl_xattr(ctx->kname->name))
626626
return do_set_acl(idmap, dentry, ctx->kname->name,
@@ -635,7 +635,7 @@ static int path_setxattr(const char __user *pathname,
635635
size_t size, int flags, unsigned int lookup_flags)
636636
{
637637
struct xattr_name kname;
638-
struct xattr_ctx ctx = {
638+
struct kernel_xattr_ctx ctx = {
639639
.cvalue = value,
640640
.kvalue = NULL,
641641
.size = size,
@@ -687,7 +687,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
687687
const void __user *,value, size_t, size, int, flags)
688688
{
689689
struct xattr_name kname;
690-
struct xattr_ctx ctx = {
690+
struct kernel_xattr_ctx ctx = {
691691
.cvalue = value,
692692
.kvalue = NULL,
693693
.size = size,
@@ -720,7 +720,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
720720
*/
721721
ssize_t
722722
do_getxattr(struct mnt_idmap *idmap, struct dentry *d,
723-
struct xattr_ctx *ctx)
723+
struct kernel_xattr_ctx *ctx)
724724
{
725725
ssize_t error;
726726
char *kname = ctx->kname->name;
@@ -755,7 +755,7 @@ getxattr(struct mnt_idmap *idmap, struct dentry *d,
755755
{
756756
ssize_t error;
757757
struct xattr_name kname;
758-
struct xattr_ctx ctx = {
758+
struct kernel_xattr_ctx ctx = {
759759
.value = value,
760760
.kvalue = NULL,
761761
.size = size,

io_uring/xattr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
struct io_xattr {
2020
struct file *file;
21-
struct xattr_ctx ctx;
21+
struct kernel_xattr_ctx ctx;
2222
struct filename *filename;
2323
};
2424

0 commit comments

Comments
 (0)