mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
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>
This commit is contained in:
parent
a71874379e
commit
537c76629d
@ -267,7 +267,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;
|
||||
@ -283,11 +283,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
|
||||
|
12
fs/xattr.c
12
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,
|
||||
@ -635,7 +635,7 @@ static int path_setxattr(const char __user *pathname,
|
||||
size_t size, int flags, unsigned int lookup_flags)
|
||||
{
|
||||
struct xattr_name kname;
|
||||
struct xattr_ctx ctx = {
|
||||
struct kernel_xattr_ctx ctx = {
|
||||
.cvalue = value,
|
||||
.kvalue = NULL,
|
||||
.size = size,
|
||||
@ -687,7 +687,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
|
||||
const void __user *,value, size_t, size, int, flags)
|
||||
{
|
||||
struct xattr_name kname;
|
||||
struct xattr_ctx ctx = {
|
||||
struct kernel_xattr_ctx ctx = {
|
||||
.cvalue = value,
|
||||
.kvalue = NULL,
|
||||
.size = size,
|
||||
@ -720,7 +720,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;
|
||||
@ -755,7 +755,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,
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
struct io_xattr {
|
||||
struct file *file;
|
||||
struct xattr_ctx ctx;
|
||||
struct kernel_xattr_ctx ctx;
|
||||
struct filename *filename;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user