torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

tree-wide: s/struct fileattr/struct file_kattr/g

Browse Source 
Now that we expose struct file_attr as our uapi struct rename all the
internal struct to struct file_kattr to clearly communicate that it is a
kernel internal struct. This is similar to struct mount_{k}attr and
others.

Link: https://lore.kernel.org/20250703-restlaufzeit-baurecht-9ed44552b481@brauner
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2025-07-03 09:36:41 +02:00
parent 6624165785
commit ca115d7e75
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
43 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/filesystems/locking.rst
View File

@ -87,8 +87,8 @@ prototypes::
int (*tmpfile) (struct mnt_idmap *, struct inode *, int (*tmpfile) (struct mnt_idmap *, struct inode *,
struct file *, umode_t); struct file *, umode_t);
int (*fileattr_set)(struct mnt_idmap *idmap, int (*fileattr_set)(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa); int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int); struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);
struct offset_ctx *(*get_offset_ctx)(struct inode *inode); struct offset_ctx *(*get_offset_ctx)(struct inode *inode);

4
Documentation/filesystems/vfs.rst
View File

@ -515,8 +515,8 @@ As of kernel 2.6.22, the following members are defined:
struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int); struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);
int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int); int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);
int (*fileattr_set)(struct mnt_idmap *idmap, int (*fileattr_set)(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa); int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
struct offset_ctx *(*get_offset_ctx)(struct inode *inode); struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
}; };

4
fs/bcachefs/fs.c
View File

@ -1619,7 +1619,7 @@ static const __maybe_unused unsigned bch_flags_to_xflags[] = {
}; };
static int bch2_fileattr_get(struct dentry *dentry, static int bch2_fileattr_get(struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct bch_inode_info *inode = to_bch_ei(d_inode(dentry)); struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
struct bch_fs *c = inode->v.i_sb->s_fs_info; struct bch_fs *c = inode->v.i_sb->s_fs_info;
@ -1682,7 +1682,7 @@ static int fssetxattr_inode_update_fn(struct btree_trans *trans,
static int bch2_fileattr_set(struct mnt_idmap *idmap, static int bch2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct bch_inode_info *inode = to_bch_ei(d_inode(dentry)); struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
struct bch_fs *c = inode->v.i_sb->s_fs_info; struct bch_fs *c = inode->v.i_sb->s_fs_info;

4
fs/btrfs/ioctl.c
View File

@ -245,7 +245,7 @@ static int btrfs_check_ioctl_vol_args2_subvol_name(const struct btrfs_ioctl_vol_
* Set flags/xflags from the internal inode flags. The remaining items of * Set flags/xflags from the internal inode flags. The remaining items of
* fsxattr are zeroed. * fsxattr are zeroed.
*/ */
int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
const struct btrfs_inode *inode = BTRFS_I(d_inode(dentry)); const struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));
@ -254,7 +254,7 @@ int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int btrfs_fileattr_set(struct mnt_idmap *idmap, int btrfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct btrfs_inode *inode = BTRFS_I(d_inode(dentry)); struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));
struct btrfs_root *root = inode->root; struct btrfs_root *root = inode->root;

6
fs/btrfs/ioctl.h
View File

@ -8,7 +8,7 @@
struct file; struct file;
struct dentry; struct dentry;
struct mnt_idmap; struct mnt_idmap;
struct fileattr; struct file_kattr;
struct io_uring_cmd; struct io_uring_cmd;
struct btrfs_inode; struct btrfs_inode;
struct btrfs_fs_info; struct btrfs_fs_info;
@ -16,9 +16,9 @@ struct btrfs_ioctl_balance_args;
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa); int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int btrfs_fileattr_set(struct mnt_idmap *idmap, int btrfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
int btrfs_ioctl_get_supported_features(void __user *arg); int btrfs_ioctl_get_supported_features(void __user *arg);
void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode); void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode);
void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info, void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,

4
fs/ecryptfs/inode.c
View File

@ -1124,13 +1124,13 @@ out:
return rc; return rc;
} }
static int ecryptfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) static int ecryptfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa); return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa);
} }
static int ecryptfs_fileattr_set(struct mnt_idmap *idmap, static int ecryptfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry); struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
int rc; int rc;

4
fs/efivarfs/inode.c
View File

@ -138,7 +138,7 @@ const struct inode_operations efivarfs_dir_inode_operations = {
}; };
static int static int
efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) efivarfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
unsigned int i_flags; unsigned int i_flags;
unsigned int flags = 0; unsigned int flags = 0;
@ -154,7 +154,7 @@ efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
static int static int
efivarfs_fileattr_set(struct mnt_idmap *idmap, efivarfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
unsigned int i_flags = 0; unsigned int i_flags = 0;

4
fs/ext2/ext2.h
View File

@ -750,9 +750,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len); u64 start, u64 len);
/* ioctl.c */ /* ioctl.c */
extern int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa); extern int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
extern int ext2_fileattr_set(struct mnt_idmap *idmap, extern int ext2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
extern long ext2_ioctl(struct file *, unsigned int, unsigned long); extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long); extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);

4
fs/ext2/ioctl.c
View File

@ -18,7 +18,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/fileattr.h> #include <linux/fileattr.h>
int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa) int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct ext2_inode_info *ei = EXT2_I(d_inode(dentry)); struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));
@ -28,7 +28,7 @@ int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int ext2_fileattr_set(struct mnt_idmap *idmap, int ext2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct ext2_inode_info *ei = EXT2_I(inode); struct ext2_inode_info *ei = EXT2_I(inode);

4
fs/ext4/ext4.h
View File

@ -3103,8 +3103,8 @@ extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
extern long ext4_ioctl(struct file *, unsigned int, unsigned long); extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long); extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);
int ext4_fileattr_set(struct mnt_idmap *idmap, int ext4_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa); int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
extern void ext4_reset_inode_seed(struct inode *inode); extern void ext4_reset_inode_seed(struct inode *inode);
int ext4_update_overhead(struct super_block *sb, bool force); int ext4_update_overhead(struct super_block *sb, bool force);
int ext4_force_shutdown(struct super_block *sb, u32 flags); int ext4_force_shutdown(struct super_block *sb, u32 flags);

4
fs/ext4/ioctl.c
View File

@ -980,7 +980,7 @@ group_add_out:
return err; return err;
} }
int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa) int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct ext4_inode_info *ei = EXT4_I(inode); struct ext4_inode_info *ei = EXT4_I(inode);
@ -997,7 +997,7 @@ int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int ext4_fileattr_set(struct mnt_idmap *idmap, int ext4_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
u32 flags = fa->flags; u32 flags = fa->flags;

4
fs/f2fs/f2fs.h
View File

@ -3615,9 +3615,9 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count);
int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag,
bool readonly, bool need_lock); bool readonly, bool need_lock);
int f2fs_precache_extents(struct inode *inode); int f2fs_precache_extents(struct inode *inode);
int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa); int f2fs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int f2fs_fileattr_set(struct mnt_idmap *idmap, int f2fs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid); int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid);

4
fs/f2fs/file.c
View File

@ -3356,7 +3356,7 @@ static int f2fs_ioc_setproject(struct inode *inode, __u32 projid)
} }
#endif #endif
int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int f2fs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct f2fs_inode_info *fi = F2FS_I(inode); struct f2fs_inode_info *fi = F2FS_I(inode);
@ -3380,7 +3380,7 @@ int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int f2fs_fileattr_set(struct mnt_idmap *idmap, int f2fs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
u32 fsflags = fa->flags, mask = F2FS_SETTABLE_FS_FL; u32 fsflags = fa->flags, mask = F2FS_SETTABLE_FS_FL;

34
fs/file_attr.c
View File

@ -17,7 +17,7 @@
* Set ->fsx_xflags, ->fsx_valid and ->flags (translated xflags). All * Set ->fsx_xflags, ->fsx_valid and ->flags (translated xflags). All
* other fields are zeroed. * other fields are zeroed.
*/ */
void fileattr_fill_xflags(struct fileattr *fa, u32 xflags) void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags)
{ {
memset(fa, 0, sizeof(*fa)); memset(fa, 0, sizeof(*fa));
fa->fsx_valid = true; fa->fsx_valid = true;
@ -47,7 +47,7 @@ EXPORT_SYMBOL(fileattr_fill_xflags);
* Set ->flags, ->flags_valid and ->fsx_xflags (translated flags). * Set ->flags, ->flags_valid and ->fsx_xflags (translated flags).
* All other fields are zeroed. * All other fields are zeroed.
*/ */
void fileattr_fill_flags(struct fileattr *fa, u32 flags) void fileattr_fill_flags(struct file_kattr *fa, u32 flags)
{ {
memset(fa, 0, sizeof(*fa)); memset(fa, 0, sizeof(*fa));
fa->flags_valid = true; fa->flags_valid = true;
@ -78,7 +78,7 @@ EXPORT_SYMBOL(fileattr_fill_flags);
* *
* Return: 0 on success, or a negative error on failure. * Return: 0 on success, or a negative error on failure.
*/ */
int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int vfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
@ -94,7 +94,7 @@ int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
EXPORT_SYMBOL(vfs_fileattr_get); EXPORT_SYMBOL(vfs_fileattr_get);
static void fileattr_to_file_attr(const struct fileattr *fa, static void fileattr_to_file_attr(const struct file_kattr *fa,
struct file_attr *fattr) struct file_attr *fattr)
{ {
__u32 mask = FS_XFLAGS_MASK; __u32 mask = FS_XFLAGS_MASK;
@ -114,7 +114,7 @@ static void fileattr_to_file_attr(const struct fileattr *fa,
* *
* Return: 0 on success, or -EFAULT on failure. * Return: 0 on success, or -EFAULT on failure.
*/ */
int copy_fsxattr_to_user(const struct fileattr *fa, struct fsxattr __user *ufa) int copy_fsxattr_to_user(const struct file_kattr *fa, struct fsxattr __user *ufa)
{ {
struct fsxattr xfa; struct fsxattr xfa;
__u32 mask = FS_XFLAGS_MASK; __u32 mask = FS_XFLAGS_MASK;
@ -134,7 +134,7 @@ int copy_fsxattr_to_user(const struct fileattr *fa, struct fsxattr __user *ufa)
EXPORT_SYMBOL(copy_fsxattr_to_user); EXPORT_SYMBOL(copy_fsxattr_to_user);
static int file_attr_to_fileattr(const struct file_attr *fattr, static int file_attr_to_fileattr(const struct file_attr *fattr,
struct fileattr *fa) struct file_kattr *fa)
{ {
__u32 mask = FS_XFLAGS_MASK; __u32 mask = FS_XFLAGS_MASK;
@ -150,7 +150,7 @@ static int file_attr_to_fileattr(const struct file_attr *fattr,
return 0; return 0;
} }
static int copy_fsxattr_from_user(struct fileattr *fa, static int copy_fsxattr_from_user(struct file_kattr *fa,
struct fsxattr __user *ufa) struct fsxattr __user *ufa)
{ {
struct fsxattr xfa; struct fsxattr xfa;
@ -179,8 +179,8 @@ static int copy_fsxattr_from_user(struct fileattr *fa,
* Note: must be called with inode lock held. * Note: must be called with inode lock held.
*/ */
static int fileattr_set_prepare(struct inode *inode, static int fileattr_set_prepare(struct inode *inode,
const struct fileattr *old_ma, const struct file_kattr *old_ma,
struct fileattr *fa) struct file_kattr *fa)
{ {
int err; int err;
@ -263,10 +263,10 @@ static int fileattr_set_prepare(struct inode *inode,
* Return: 0 on success, or a negative error on failure. * Return: 0 on success, or a negative error on failure.
*/ */
int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry, int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct fileattr old_ma = {}; struct file_kattr old_ma = {};
int err; int err;
if (!inode->i_op->fileattr_set) if (!inode->i_op->fileattr_set)
@ -308,7 +308,7 @@ EXPORT_SYMBOL(vfs_fileattr_set);
int ioctl_getflags(struct file *file, unsigned int __user *argp) int ioctl_getflags(struct file *file, unsigned int __user *argp)
{ {
struct fileattr fa = { .flags_valid = true }; /* hint only */ struct file_kattr fa = { .flags_valid = true }; /* hint only */
int err; int err;
err = vfs_fileattr_get(file->f_path.dentry, &fa); err = vfs_fileattr_get(file->f_path.dentry, &fa);
@ -324,7 +324,7 @@ int ioctl_setflags(struct file *file, unsigned int __user *argp)
{ {
struct mnt_idmap *idmap = file_mnt_idmap(file); struct mnt_idmap *idmap = file_mnt_idmap(file);
struct dentry *dentry = file->f_path.dentry; struct dentry *dentry = file->f_path.dentry;
struct fileattr fa; struct file_kattr fa;
unsigned int flags; unsigned int flags;
int err; int err;
@ -345,7 +345,7 @@ EXPORT_SYMBOL(ioctl_setflags);
int ioctl_fsgetxattr(struct file *file, void __user *argp) int ioctl_fsgetxattr(struct file *file, void __user *argp)
{ {
struct fileattr fa = { .fsx_valid = true }; /* hint only */ struct file_kattr fa = { .fsx_valid = true }; /* hint only */
int err; int err;
err = vfs_fileattr_get(file->f_path.dentry, &fa); err = vfs_fileattr_get(file->f_path.dentry, &fa);
@ -362,7 +362,7 @@ int ioctl_fssetxattr(struct file *file, void __user *argp)
{ {
struct mnt_idmap *idmap = file_mnt_idmap(file); struct mnt_idmap *idmap = file_mnt_idmap(file);
struct dentry *dentry = file->f_path.dentry; struct dentry *dentry = file->f_path.dentry;
struct fileattr fa; struct file_kattr fa;
int err; int err;
err = copy_fsxattr_from_user(&fa, argp); err = copy_fsxattr_from_user(&fa, argp);
@ -387,7 +387,7 @@ SYSCALL_DEFINE5(file_getattr, int, dfd, const char __user *, filename,
struct filename *name __free(putname) = NULL; struct filename *name __free(putname) = NULL;
unsigned int lookup_flags = 0; unsigned int lookup_flags = 0;
struct file_attr fattr; struct file_attr fattr;
struct fileattr fa; struct file_kattr fa;
int error; int error;
BUILD_BUG_ON(sizeof(struct file_attr) < FILE_ATTR_SIZE_VER0); BUILD_BUG_ON(sizeof(struct file_attr) < FILE_ATTR_SIZE_VER0);
@ -442,7 +442,7 @@ SYSCALL_DEFINE5(file_setattr, int, dfd, const char __user *, filename,
struct filename *name __free(putname) = NULL; struct filename *name __free(putname) = NULL;
unsigned int lookup_flags = 0; unsigned int lookup_flags = 0;
struct file_attr fattr; struct file_attr fattr;
struct fileattr fa; struct file_kattr fa;
int error; int error;
BUILD_BUG_ON(sizeof(struct file_attr) < FILE_ATTR_SIZE_VER0); BUILD_BUG_ON(sizeof(struct file_attr) < FILE_ATTR_SIZE_VER0);

4
fs/fuse/fuse_i.h
View File

@ -1486,9 +1486,9 @@ void fuse_dax_cancel_work(struct fuse_conn *fc);
long fuse_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long fuse_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
long fuse_file_compat_ioctl(struct file *file, unsigned int cmd, long fuse_file_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg); unsigned long arg);
int fuse_fileattr_get(struct dentry *dentry, struct fileattr *fa); int fuse_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int fuse_fileattr_set(struct mnt_idmap *idmap, int fuse_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
/* iomode.c */ /* iomode.c */
int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff); int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff);

4
fs/fuse/ioctl.c
View File

@ -502,7 +502,7 @@ static void fuse_priv_ioctl_cleanup(struct inode *inode, struct fuse_file *ff)
fuse_file_release(inode, ff, O_RDONLY, NULL, S_ISDIR(inode->i_mode)); fuse_file_release(inode, ff, O_RDONLY, NULL, S_ISDIR(inode->i_mode));
} }
int fuse_fileattr_get(struct dentry *dentry, struct fileattr *fa) int fuse_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct fuse_file *ff; struct fuse_file *ff;
@ -542,7 +542,7 @@ cleanup:
} }
int fuse_fileattr_set(struct mnt_idmap *idmap, int fuse_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct fuse_file *ff; struct fuse_file *ff;

4
fs/gfs2/file.c
View File

@ -155,7 +155,7 @@ static inline u32 gfs2_gfsflags_to_fsflags(struct inode *inode, u32 gfsflags)
return fsflags; return fsflags;
} }
int gfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa) int gfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
@ -276,7 +276,7 @@ out:
} }
int gfs2_fileattr_set(struct mnt_idmap *idmap, int gfs2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
u32 fsflags = fa->flags, gfsflags = 0; u32 fsflags = fa->flags, gfsflags = 0;

4
fs/gfs2/inode.h
View File

@ -107,9 +107,9 @@ loff_t gfs2_seek_hole(struct file *file, loff_t offset);
extern const struct file_operations gfs2_file_fops_nolock; extern const struct file_operations gfs2_file_fops_nolock;
extern const struct file_operations gfs2_dir_fops_nolock; extern const struct file_operations gfs2_dir_fops_nolock;
int gfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa); int gfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int gfs2_fileattr_set(struct mnt_idmap *idmap, int gfs2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
void gfs2_set_inode_flags(struct inode *inode); void gfs2_set_inode_flags(struct inode *inode);
#ifdef CONFIG_GFS2_FS_LOCKING_DLM #ifdef CONFIG_GFS2_FS_LOCKING_DLM

4
fs/hfsplus/hfsplus_fs.h
View File

@ -489,9 +489,9 @@ int hfsplus_getattr(struct mnt_idmap *idmap, const struct path *path,
unsigned int query_flags); unsigned int query_flags);
int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end, int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
int datasync); int datasync);
int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa); int hfsplus_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int hfsplus_fileattr_set(struct mnt_idmap *idmap, int hfsplus_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
/* ioctl.c */ /* ioctl.c */
long hfsplus_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); long hfsplus_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);

4
fs/hfsplus/inode.c
View File

@ -654,7 +654,7 @@ out:
return res; return res;
} }
int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa) int hfsplus_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct hfsplus_inode_info *hip = HFSPLUS_I(inode); struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
@ -673,7 +673,7 @@ int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int hfsplus_fileattr_set(struct mnt_idmap *idmap, int hfsplus_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct hfsplus_inode_info *hip = HFSPLUS_I(inode); struct hfsplus_inode_info *hip = HFSPLUS_I(inode);

4
fs/jfs/ioctl.c
View File

@ -57,7 +57,7 @@ static long jfs_map_ext2(unsigned long flags, int from)
return mapped; return mapped;
} }
int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int jfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct jfs_inode_info *jfs_inode = JFS_IP(d_inode(dentry)); struct jfs_inode_info *jfs_inode = JFS_IP(d_inode(dentry));
unsigned int flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE; unsigned int flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE;
@ -71,7 +71,7 @@ int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int jfs_fileattr_set(struct mnt_idmap *idmap, int jfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct jfs_inode_info *jfs_inode = JFS_IP(inode); struct jfs_inode_info *jfs_inode = JFS_IP(inode);

4
fs/jfs/jfs_inode.h
View File

@ -9,9 +9,9 @@ struct fid;
extern struct inode *ialloc(struct inode *, umode_t); extern struct inode *ialloc(struct inode *, umode_t);
extern int jfs_fsync(struct file *, loff_t, loff_t, int); extern int jfs_fsync(struct file *, loff_t, loff_t, int);
extern int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa); extern int jfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
extern int jfs_fileattr_set(struct mnt_idmap *idmap, extern int jfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
extern long jfs_ioctl(struct file *, unsigned int, unsigned long); extern long jfs_ioctl(struct file *, unsigned int, unsigned long);
extern struct inode *jfs_iget(struct super_block *, unsigned long); extern struct inode *jfs_iget(struct super_block *, unsigned long);
extern int jfs_commit_inode(struct inode *, int); extern int jfs_commit_inode(struct inode *, int);

4
fs/nilfs2/ioctl.c
View File

@ -118,7 +118,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,
* *
* Return: always 0 as success. * Return: always 0 as success.
*/ */
int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int nilfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -136,7 +136,7 @@ int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
* Return: 0 on success, or a negative error code on failure. * Return: 0 on success, or a negative error code on failure.
*/ */
int nilfs_fileattr_set(struct mnt_idmap *idmap, int nilfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct nilfs_transaction_info ti; struct nilfs_transaction_info ti;

4
fs/nilfs2/nilfs.h
View File

@ -268,9 +268,9 @@ int nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,
extern int nilfs_sync_file(struct file *, loff_t, loff_t, int); extern int nilfs_sync_file(struct file *, loff_t, loff_t, int);
/* ioctl.c */ /* ioctl.c */
int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *m); int nilfs_fileattr_get(struct dentry *dentry, struct file_kattr *m);
int nilfs_fileattr_set(struct mnt_idmap *idmap, int nilfs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
long nilfs_ioctl(struct file *, unsigned int, unsigned long); long nilfs_ioctl(struct file *, unsigned int, unsigned long);
long nilfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long nilfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, struct nilfs_argv *, int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, struct nilfs_argv *,

4
fs/ocfs2/ioctl.c
View File

@ -62,7 +62,7 @@ static inline int o2info_coherent(struct ocfs2_info_request *req)
return (!(req->ir_flags & OCFS2_INFO_FL_NON_COHERENT)); return (!(req->ir_flags & OCFS2_INFO_FL_NON_COHERENT));
} }
int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa) int ocfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int flags; unsigned int flags;
@ -83,7 +83,7 @@ int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int ocfs2_fileattr_set(struct mnt_idmap *idmap, int ocfs2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int flags = fa->flags; unsigned int flags = fa->flags;

4
fs/ocfs2/ioctl.h
View File

@ -11,9 +11,9 @@
#ifndef OCFS2_IOCTL_PROTO_H #ifndef OCFS2_IOCTL_PROTO_H
#define OCFS2_IOCTL_PROTO_H #define OCFS2_IOCTL_PROTO_H
int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa); int ocfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int ocfs2_fileattr_set(struct mnt_idmap *idmap, int ocfs2_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg); long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);

4
fs/orangefs/inode.c
View File

@ -887,7 +887,7 @@ int orangefs_update_time(struct inode *inode, int flags)
return __orangefs_setattr(inode, &iattr); return __orangefs_setattr(inode, &iattr);
} }
static int orangefs_fileattr_get(struct dentry *dentry, struct fileattr *fa) static int orangefs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
u64 val = 0; u64 val = 0;
int ret; int ret;
@ -908,7 +908,7 @@ static int orangefs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
static int orangefs_fileattr_set(struct mnt_idmap *idmap, static int orangefs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
u64 val = 0; u64 val = 0;

4
fs/overlayfs/copy_up.c
View File

@ -171,8 +171,8 @@ out:
static int ovl_copy_fileattr(struct inode *inode, const struct path *old, static int ovl_copy_fileattr(struct inode *inode, const struct path *old,
const struct path *new) const struct path *new)
{ {
struct fileattr oldfa = { .flags_valid = true }; struct file_kattr oldfa = { .flags_valid = true };
struct fileattr newfa = { .flags_valid = true }; struct file_kattr newfa = { .flags_valid = true };
int err; int err;
err = ovl_real_fileattr_get(old, &oldfa); err = ovl_real_fileattr_get(old, &oldfa);

12
fs/overlayfs/inode.c
View File

@ -610,7 +610,7 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
* Introducing security_inode_fileattr_get/set() hooks would solve this issue * Introducing security_inode_fileattr_get/set() hooks would solve this issue
* properly. * properly.
*/ */
static int ovl_security_fileattr(const struct path *realpath, struct fileattr *fa, static int ovl_security_fileattr(const struct path *realpath, struct file_kattr *fa,
bool set) bool set)
{ {
struct file *file; struct file *file;
@ -637,7 +637,7 @@ static int ovl_security_fileattr(const struct path *realpath, struct fileattr *f
return err; return err;
} }
int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa) int ovl_real_fileattr_set(const struct path *realpath, struct file_kattr *fa)
{ {
int err; int err;
@ -649,7 +649,7 @@ int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa)
} }
int ovl_fileattr_set(struct mnt_idmap *idmap, int ovl_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct path upperpath; struct path upperpath;
@ -697,7 +697,7 @@ out:
} }
/* Convert inode protection flags to fileattr flags */ /* Convert inode protection flags to fileattr flags */
static void ovl_fileattr_prot_flags(struct inode *inode, struct fileattr *fa) static void ovl_fileattr_prot_flags(struct inode *inode, struct file_kattr *fa)
{ {
BUILD_BUG_ON(OVL_PROT_FS_FLAGS_MASK & ~FS_COMMON_FL); BUILD_BUG_ON(OVL_PROT_FS_FLAGS_MASK & ~FS_COMMON_FL);
BUILD_BUG_ON(OVL_PROT_FSX_FLAGS_MASK & ~FS_XFLAG_COMMON); BUILD_BUG_ON(OVL_PROT_FSX_FLAGS_MASK & ~FS_XFLAG_COMMON);
@ -712,7 +712,7 @@ static void ovl_fileattr_prot_flags(struct inode *inode, struct fileattr *fa)
} }
} }
int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa) int ovl_real_fileattr_get(const struct path *realpath, struct file_kattr *fa)
{ {
int err; int err;
@ -723,7 +723,7 @@ int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa)
return vfs_fileattr_get(realpath->dentry, fa); return vfs_fileattr_get(realpath->dentry, fa);
} }
int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa) int ovl_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct path realpath; struct path realpath;

10
fs/overlayfs/overlayfs.h
View File

@ -815,7 +815,7 @@ void ovl_copyattr(struct inode *to);
void ovl_check_protattr(struct inode *inode, struct dentry *upper); void ovl_check_protattr(struct inode *inode, struct dentry *upper);
int ovl_set_protattr(struct inode *inode, struct dentry *upper, int ovl_set_protattr(struct inode *inode, struct dentry *upper,
struct fileattr *fa); struct file_kattr *fa);
static inline void ovl_copyflags(struct inode *from, struct inode *to) static inline void ovl_copyflags(struct inode *from, struct inode *to)
{ {
@ -847,11 +847,11 @@ struct dentry *ovl_create_temp(struct ovl_fs *ofs, struct dentry *workdir,
/* file.c */ /* file.c */
extern const struct file_operations ovl_file_operations; extern const struct file_operations ovl_file_operations;
int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa); int ovl_real_fileattr_get(const struct path *realpath, struct file_kattr *fa);
int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa); int ovl_real_fileattr_set(const struct path *realpath, struct file_kattr *fa);
int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa); int ovl_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int ovl_fileattr_set(struct mnt_idmap *idmap, int ovl_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
struct ovl_file; struct ovl_file;
struct ovl_file *ovl_file_alloc(struct file *realfile); struct ovl_file *ovl_file_alloc(struct file *realfile);
void ovl_file_free(struct ovl_file *of); void ovl_file_free(struct ovl_file *of);

2
fs/overlayfs/util.c
View File

@ -959,7 +959,7 @@ void ovl_check_protattr(struct inode *inode, struct dentry *upper)
} }
int ovl_set_protattr(struct inode *inode, struct dentry *upper, int ovl_set_protattr(struct inode *inode, struct dentry *upper,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct ovl_fs *ofs = OVL_FS(inode->i_sb); struct ovl_fs *ofs = OVL_FS(inode->i_sb);
char buf[OVL_PROTATTR_MAX]; char buf[OVL_PROTATTR_MAX];

4
fs/ubifs/ioctl.c
View File

@ -130,7 +130,7 @@ static int setflags(struct inode *inode, int flags)
return err; return err;
} }
int ubifs_fileattr_get(struct dentry *dentry, struct fileattr *fa) int ubifs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int flags = ubifs2ioctl(ubifs_inode(inode)->flags); int flags = ubifs2ioctl(ubifs_inode(inode)->flags);
@ -145,7 +145,7 @@ int ubifs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
int ubifs_fileattr_set(struct mnt_idmap *idmap, int ubifs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int flags = fa->flags; int flags = fa->flags;

4
fs/ubifs/ubifs.h
View File

@ -2073,9 +2073,9 @@ int ubifs_recover_size(struct ubifs_info *c, bool in_place);
void ubifs_destroy_size_tree(struct ubifs_info *c); void ubifs_destroy_size_tree(struct ubifs_info *c);
/* ioctl.c */ /* ioctl.c */
int ubifs_fileattr_get(struct dentry *dentry, struct fileattr *fa); int ubifs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int ubifs_fileattr_set(struct mnt_idmap *idmap, int ubifs_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void ubifs_set_inode_flags(struct inode *inode); void ubifs_set_inode_flags(struct inode *inode);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT

18
fs/xfs/xfs_ioctl.c
View File

@ -444,7 +444,7 @@ static void
xfs_fill_fsxattr( xfs_fill_fsxattr(
struct xfs_inode *ip, struct xfs_inode *ip,
int whichfork, int whichfork,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct xfs_ifork *ifp = xfs_ifork_ptr(ip, whichfork); struct xfs_ifork *ifp = xfs_ifork_ptr(ip, whichfork);
@ -496,7 +496,7 @@ xfs_ioc_fsgetxattra(
xfs_inode_t *ip, xfs_inode_t *ip,
void __user *arg) void __user *arg)
{ {
struct fileattr fa; struct file_kattr fa;
xfs_ilock(ip, XFS_ILOCK_SHARED); xfs_ilock(ip, XFS_ILOCK_SHARED);
xfs_fill_fsxattr(ip, XFS_ATTR_FORK, &fa); xfs_fill_fsxattr(ip, XFS_ATTR_FORK, &fa);
@ -508,7 +508,7 @@ xfs_ioc_fsgetxattra(
int int
xfs_fileattr_get( xfs_fileattr_get(
struct dentry *dentry, struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_inode *ip = XFS_I(d_inode(dentry)); struct xfs_inode *ip = XFS_I(d_inode(dentry));
@ -526,7 +526,7 @@ static int
xfs_ioctl_setattr_xflags( xfs_ioctl_setattr_xflags(
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_inode *ip, struct xfs_inode *ip,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME); bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME);
@ -582,7 +582,7 @@ xfs_ioctl_setattr_xflags(
static void static void
xfs_ioctl_setattr_prepare_dax( xfs_ioctl_setattr_prepare_dax(
struct xfs_inode *ip, struct xfs_inode *ip,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct inode *inode = VFS_I(ip); struct inode *inode = VFS_I(ip);
@ -642,7 +642,7 @@ out_error:
static int static int
xfs_ioctl_setattr_check_extsize( xfs_ioctl_setattr_check_extsize(
struct xfs_inode *ip, struct xfs_inode *ip,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
xfs_failaddr_t failaddr; xfs_failaddr_t failaddr;
@ -684,7 +684,7 @@ xfs_ioctl_setattr_check_extsize(
static int static int
xfs_ioctl_setattr_check_cowextsize( xfs_ioctl_setattr_check_cowextsize(
struct xfs_inode *ip, struct xfs_inode *ip,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
xfs_failaddr_t failaddr; xfs_failaddr_t failaddr;
@ -709,7 +709,7 @@ xfs_ioctl_setattr_check_cowextsize(
static int static int
xfs_ioctl_setattr_check_projid( xfs_ioctl_setattr_check_projid(
struct xfs_inode *ip, struct xfs_inode *ip,
struct fileattr *fa) struct file_kattr *fa)
{ {
if (!fa->fsx_valid) if (!fa->fsx_valid)
return 0; return 0;
@ -725,7 +725,7 @@ int
xfs_fileattr_set( xfs_fileattr_set(
struct mnt_idmap *idmap, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
struct xfs_inode *ip = XFS_I(d_inode(dentry)); struct xfs_inode *ip = XFS_I(d_inode(dentry));
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;

4
fs/xfs/xfs_ioctl.h
View File

@ -17,13 +17,13 @@ xfs_ioc_swapext(
extern int extern int
xfs_fileattr_get( xfs_fileattr_get(
struct dentry *dentry, struct dentry *dentry,
struct fileattr *fa); struct file_kattr *fa);
extern int extern int
xfs_fileattr_set( xfs_fileattr_set(
struct mnt_idmap *idmap, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct fileattr *fa); struct file_kattr *fa);
extern long extern long
xfs_file_ioctl( xfs_file_ioctl(

14
include/linux/fileattr.h
View File

@ -40,7 +40,7 @@
* is handled by the VFS helpers, so filesystems are free to implement just one * is handled by the VFS helpers, so filesystems are free to implement just one
* or both of these sub-interfaces. * or both of these sub-interfaces.
*/ */
struct fileattr { struct file_kattr {
u32 flags; /* flags (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS) */ u32 flags; /* flags (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS) */
/* struct fsxattr: */ /* struct fsxattr: */
u32 fsx_xflags; /* xflags field value (get/set) */ u32 fsx_xflags; /* xflags field value (get/set) */
@ -53,10 +53,10 @@ struct fileattr {
bool fsx_valid:1; bool fsx_valid:1;
}; };
int copy_fsxattr_to_user(const struct fileattr *fa, struct fsxattr __user *ufa); int copy_fsxattr_to_user(const struct file_kattr *fa, struct fsxattr __user *ufa);
void fileattr_fill_xflags(struct fileattr *fa, u32 xflags); void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags);
void fileattr_fill_flags(struct fileattr *fa, u32 flags); void fileattr_fill_flags(struct file_kattr *fa, u32 flags);
/** /**
* fileattr_has_fsx - check for extended flags/attributes * fileattr_has_fsx - check for extended flags/attributes
@ -65,16 +65,16 @@ void fileattr_fill_flags(struct fileattr *fa, u32 flags);
* Return: true if any attributes are present that are not represented in * Return: true if any attributes are present that are not represented in
* ->flags. * ->flags.
*/ */
static inline bool fileattr_has_fsx(const struct fileattr *fa) static inline bool fileattr_has_fsx(const struct file_kattr *fa)
{ {
return fa->fsx_valid && return fa->fsx_valid &&
((fa->fsx_xflags & ~FS_XFLAG_COMMON) || fa->fsx_extsize != 0 || ((fa->fsx_xflags & ~FS_XFLAG_COMMON) || fa->fsx_extsize != 0 ||
fa->fsx_projid != 0 || fa->fsx_cowextsize != 0); fa->fsx_projid != 0 || fa->fsx_cowextsize != 0);
} }
int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa); int vfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry, int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,
struct fileattr *fa); struct file_kattr *fa);
int ioctl_getflags(struct file *file, unsigned int __user *argp); int ioctl_getflags(struct file *file, unsigned int __user *argp);
int ioctl_setflags(struct file *file, unsigned int __user *argp); int ioctl_setflags(struct file *file, unsigned int __user *argp);
int ioctl_fsgetxattr(struct file *file, void __user *argp); int ioctl_fsgetxattr(struct file *file, void __user *argp);

6
include/linux/fs.h
View File

@ -80,7 +80,7 @@ struct fsnotify_mark_connector;
struct fsnotify_sb_info; struct fsnotify_sb_info;
struct fs_context; struct fs_context;
struct fs_parameter_spec; struct fs_parameter_spec;
struct fileattr; struct file_kattr;
struct iomap_ops; struct iomap_ops;
extern void __init inode_init(void); extern void __init inode_init(void);
@ -2254,8 +2254,8 @@ struct inode_operations {
int (*set_acl)(struct mnt_idmap *, struct dentry *, int (*set_acl)(struct mnt_idmap *, struct dentry *,
struct posix_acl *, int); struct posix_acl *, int);
int (*fileattr_set)(struct mnt_idmap *idmap, int (*fileattr_set)(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct file_kattr *fa);
int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa); int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
struct offset_ctx *(*get_offset_ctx)(struct inode *inode); struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
} ____cacheline_aligned; } ____cacheline_aligned;

4
include/linux/lsm_hook_defs.h
View File

@ -157,8 +157,8 @@ LSM_HOOK(int, 0, inode_removexattr, struct mnt_idmap *idmap,
struct dentry *dentry, const char *name) struct dentry *dentry, const char *name)
LSM_HOOK(void, LSM_RET_VOID, inode_post_removexattr, struct dentry *dentry, LSM_HOOK(void, LSM_RET_VOID, inode_post_removexattr, struct dentry *dentry,
const char *name) const char *name)
LSM_HOOK(int, 0, inode_file_setattr, struct dentry *dentry, struct fileattr *fa) LSM_HOOK(int, 0, inode_file_setattr, struct dentry *dentry, struct file_kattr *fa)
LSM_HOOK(int, 0, inode_file_getattr, struct dentry *dentry, struct fileattr *fa) LSM_HOOK(int, 0, inode_file_getattr, struct dentry *dentry, struct file_kattr *fa)
LSM_HOOK(int, 0, inode_set_acl, struct mnt_idmap *idmap, LSM_HOOK(int, 0, inode_set_acl, struct mnt_idmap *idmap,
struct dentry *dentry, const char *acl_name, struct posix_acl *kacl) struct dentry *dentry, const char *acl_name, struct posix_acl *kacl)
LSM_HOOK(void, LSM_RET_VOID, inode_post_set_acl, struct dentry *dentry, LSM_HOOK(void, LSM_RET_VOID, inode_post_set_acl, struct dentry *dentry,

8
include/linux/security.h
View File

@ -452,9 +452,9 @@ int security_inode_removexattr(struct mnt_idmap *idmap,
struct dentry *dentry, const char *name); struct dentry *dentry, const char *name);
void security_inode_post_removexattr(struct dentry *dentry, const char *name); void security_inode_post_removexattr(struct dentry *dentry, const char *name);
int security_inode_file_setattr(struct dentry *dentry, int security_inode_file_setattr(struct dentry *dentry,
struct fileattr *fa); struct file_kattr *fa);
int security_inode_file_getattr(struct dentry *dentry, int security_inode_file_getattr(struct dentry *dentry,
struct fileattr *fa); struct file_kattr *fa);
int security_inode_need_killpriv(struct dentry *dentry); int security_inode_need_killpriv(struct dentry *dentry);
int security_inode_killpriv(struct mnt_idmap *idmap, struct dentry *dentry); int security_inode_killpriv(struct mnt_idmap *idmap, struct dentry *dentry);
int security_inode_getsecurity(struct mnt_idmap *idmap, int security_inode_getsecurity(struct mnt_idmap *idmap,
@ -1057,13 +1057,13 @@ static inline void security_inode_post_removexattr(struct dentry *dentry,
{ } { }
static inline int security_inode_file_setattr(struct dentry *dentry, static inline int security_inode_file_setattr(struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
return 0; return 0;
} }
static inline int security_inode_file_getattr(struct dentry *dentry, static inline int security_inode_file_getattr(struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
return 0; return 0;
} }

2
include/uapi/linux/fs.h
View File

@ -151,7 +151,7 @@ struct fsxattr {
/* /*
* Variable size structure for file_[sg]et_attr(). * Variable size structure for file_[sg]et_attr().
* *
* Note. This is alternative to the structure 'struct fileattr'/'struct fsxattr'. * Note. This is alternative to the structure 'struct file_kattr'/'struct fsxattr'.
* As this structure is passed to/from userspace with its size, this can * As this structure is passed to/from userspace with its size, this can
* be versioned based on the size. * be versioned based on the size.
*/ */

4
mm/shmem.c
View File

@ -4183,7 +4183,7 @@ static const char *shmem_get_link(struct dentry *dentry, struct inode *inode,
#ifdef CONFIG_TMPFS_XATTR #ifdef CONFIG_TMPFS_XATTR
static int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa) static int shmem_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{ {
struct shmem_inode_info *info = SHMEM_I(d_inode(dentry)); struct shmem_inode_info *info = SHMEM_I(d_inode(dentry));
@ -4193,7 +4193,7 @@ static int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
} }
static int shmem_fileattr_set(struct mnt_idmap *idmap, static int shmem_fileattr_set(struct mnt_idmap *idmap,
struct dentry *dentry, struct fileattr *fa) struct dentry *dentry, struct file_kattr *fa)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_inode_info *info = SHMEM_I(inode);

4
security/security.c
View File

@ -2632,7 +2632,7 @@ void security_inode_post_removexattr(struct dentry *dentry, const char *name)
* *
* Return: Returns 0 if permission is granted. * Return: Returns 0 if permission is granted.
*/ */
int security_inode_file_setattr(struct dentry *dentry, struct fileattr *fa) int security_inode_file_setattr(struct dentry *dentry, struct file_kattr *fa)
{ {
return call_int_hook(inode_file_setattr, dentry, fa); return call_int_hook(inode_file_setattr, dentry, fa);
} }
@ -2647,7 +2647,7 @@ int security_inode_file_setattr(struct dentry *dentry, struct fileattr *fa)
* *
* Return: Returns 0 if permission is granted. * Return: Returns 0 if permission is granted.
*/ */
int security_inode_file_getattr(struct dentry *dentry, struct fileattr *fa) int security_inode_file_getattr(struct dentry *dentry, struct file_kattr *fa)
{ {
return call_int_hook(inode_file_getattr, dentry, fa); return call_int_hook(inode_file_getattr, dentry, fa);
} }

4
security/selinux/hooks.c
View File

@ -3481,13 +3481,13 @@ static int selinux_inode_removexattr(struct mnt_idmap *idmap,
} }
static int selinux_inode_file_setattr(struct dentry *dentry, static int selinux_inode_file_setattr(struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
return dentry_has_perm(current_cred(), dentry, FILE__SETATTR); return dentry_has_perm(current_cred(), dentry, FILE__SETATTR);
} }
static int selinux_inode_file_getattr(struct dentry *dentry, static int selinux_inode_file_getattr(struct dentry *dentry,
struct fileattr *fa) struct file_kattr *fa)
{ {
return dentry_has_perm(current_cred(), dentry, FILE__GETATTR); return dentry_has_perm(current_cred(), dentry, FILE__GETATTR);
} }