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

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>

diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst
index 2e567e341c3bde5b583bed7ec2e4c6264c44c048..2ff02653d7ccc6c6ee1d3fbbc3dcd79ddd752c14 100644 (file)
--- a/Documentation/filesystems/locking.rst
+++ b/Documentation/filesystems/locking.rst
@@ -87,8 +87,8 @@ prototypes::
        int (*tmpfile) (struct mnt_idmap *, struct inode *,
                        struct file *, umode_t);
        int (*fileattr_set)(struct mnt_idmap *idmap,
-                           struct dentry *dentry, struct fileattr *fa);
-       int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);
+                           struct dentry *dentry, struct file_kattr *fa);
+       int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
        struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);
        struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
 

diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst
index fd32a9a17bfb34e3f307ef6281d1114afe4fbc66..f2bbf4def123733090eec6fc974cdf62719480ca 100644 (file)
--- a/Documentation/filesystems/vfs.rst
+++ b/Documentation/filesystems/vfs.rst
@@ -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);
                int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);
                int (*fileattr_set)(struct mnt_idmap *idmap,
-                                   struct dentry *dentry, struct fileattr *fa);
-               int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);
+                                   struct dentry *dentry, struct file_kattr *fa);
+               int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
                struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
        };
 

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 85d13f800165cd3863283d6a401d361e17aeae4e..7c4de887629c4a4db037b9959d075b2615e8e17e 100644 (file)
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -1619,7 +1619,7 @@ static const __maybe_unused unsigned bch_flags_to_xflags[] = {
 };
 
 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_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,
                             struct dentry *dentry,
-                            struct fileattr *fa)
+                            struct file_kattr *fa)
 {
        struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
        struct bch_fs *c = inode->v.i_sb->s_fs_info;

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 913acef3f0a9691f4d21f6a17a96995d4cb55039..ffb28bfba4fad04268b6ba7071107ba95a0e0248 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -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
  * 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));
 
@@ -254,7 +254,7 @@ int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 }
 
 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_root *root = inode->root;

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index e08ea446cf48acbb4cd72a4ca35e1fb7c504891b..ccf6bed9cc24ee566874582e16b834f8c8a6d930 100644 (file)
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -8,7 +8,7 @@
 struct file;
 struct dentry;
 struct mnt_idmap;
-struct fileattr;
+struct file_kattr;
 struct io_uring_cmd;
 struct btrfs_inode;
 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_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,
-                      struct dentry *dentry, struct fileattr *fa);
+                      struct dentry *dentry, struct file_kattr *fa);
 int btrfs_ioctl_get_supported_features(void __user *arg);
 void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode);
 void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 493d7f19495616f97d2e37efd43c19b773a2ed02..d83416af17b40085b9b7ad695b1c03665e2313e0 100644 (file)
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -1124,13 +1124,13 @@ out:
        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);
 }
 
 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);
        int rc;

diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c
index 98a7299a9ee9e08d9ff1746d0a42bb67b52a60dc..2891614abf8d554f563319187b6d54c2bc006a91 100644 (file)
--- a/fs/efivarfs/inode.c
+++ b/fs/efivarfs/inode.c
@@ -138,7 +138,7 @@ const struct inode_operations efivarfs_dir_inode_operations = {
 };
 
 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 flags = 0;
@@ -154,7 +154,7 @@ efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 
 static int
 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;
 

diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 4025f875252aeeb4f9bba9049746719737efb74f..cf97b76e9fd3e9cf1d2553e7dc8813497b42e177 100644 (file)
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -750,9 +750,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                       u64 start, u64 len);
 
 /* 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,
-                            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_compat_ioctl(struct file *, unsigned int, unsigned long);
 

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index 44e04484e570c49a54921f3c754098cd4c4d1eb9..c3fea55b8efa4cbf27debc4bc6ad09c68ac361cc 100644 (file)
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -18,7 +18,7 @@
 #include <linux/uaccess.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));
 
@@ -28,7 +28,7 @@ int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 }
 
 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 ext2_inode_info *ei = EXT2_I(inode);

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 18373de980f27aad43fae87b0b435cdea6c3c9ba..7d962e7f388a85e586aaac06f579de450a912a53 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -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_compat_ioctl(struct file *, unsigned int, unsigned long);
 int ext4_fileattr_set(struct mnt_idmap *idmap,
-                     struct dentry *dentry, struct fileattr *fa);
-int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa);
+                     struct dentry *dentry, struct file_kattr *fa);
+int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
 extern void ext4_reset_inode_seed(struct inode *inode);
 int ext4_update_overhead(struct super_block *sb, bool force);
 int ext4_force_shutdown(struct super_block *sb, u32 flags);

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 5668a17458aede245949f889319c95c27b577ab6..84e3c73952d72e436429489f5fc8b7ae1c01c7a1 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -980,7 +980,7 @@ group_add_out:
        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 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,
-                     struct dentry *dentry, struct fileattr *fa)
+                     struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        u32 flags = fa->flags;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 9333a22b9a01ed48a8c4121fa1672f08afa566d0..c78464792cebe0a2d936839d23f3cbd247c8b430 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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,
                                                bool readonly, bool need_lock);
 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,
-                     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_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 6bd3de64f2a83d7c1ce5c14d50a6f434ceccac72..90180ca22abd9322797c49654848dfb01cdaa5b4 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3356,7 +3356,7 @@ static int f2fs_ioc_setproject(struct inode *inode, __u32 projid)
 }
 #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 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,
-                     struct dentry *dentry, struct fileattr *fa)
+                     struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        u32 fsflags = fa->flags, mask = F2FS_SETTABLE_FS_FL;

diff --git a/fs/file_attr.c b/fs/file_attr.c
index 21d6a0607345940f53eb9a8c1166c0230ae0c60c..17745c89e2be58a47169e166b84a5d9f08c66daf 100644 (file)
--- a/fs/file_attr.c
+++ b/fs/file_attr.c
@@ -17,7 +17,7 @@
  * Set ->fsx_xflags, ->fsx_valid and ->flags (translated xflags).  All
  * 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));
        fa->fsx_valid = true;
@@ -47,7 +47,7 @@ EXPORT_SYMBOL(fileattr_fill_xflags);
  * Set ->flags, ->flags_valid and ->fsx_xflags (translated flags).
  * 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));
        fa->flags_valid = true;
@@ -78,7 +78,7 @@ EXPORT_SYMBOL(fileattr_fill_flags);
  *
  * 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);
        int error;
@@ -94,7 +94,7 @@ int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 }
 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)
 {
        __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.
  */
-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;
        __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);
 
 static int file_attr_to_fileattr(const struct file_attr *fattr,
-                                struct fileattr *fa)
+                                struct file_kattr *fa)
 {
        __u32 mask = FS_XFLAGS_MASK;
 
@@ -150,7 +150,7 @@ static int file_attr_to_fileattr(const struct file_attr *fattr,
        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 xfa;
@@ -179,8 +179,8 @@ static int copy_fsxattr_from_user(struct fileattr *fa,
  * Note: must be called with inode lock held.
  */
 static int fileattr_set_prepare(struct inode *inode,
-                             const struct fileattr *old_ma,
-                             struct fileattr *fa)
+                             const struct file_kattr *old_ma,
+                             struct file_kattr *fa)
 {
        int err;
 
@@ -263,10 +263,10 @@ static int fileattr_set_prepare(struct inode *inode,
  * Return: 0 on success, or a negative error on failure.
  */
 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 fileattr old_ma = {};
+       struct file_kattr old_ma = {};
        int err;
 
        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)
 {
-       struct fileattr fa = { .flags_valid = true }; /* hint only */
+       struct file_kattr fa = { .flags_valid = true }; /* hint only */
        int err;
 
        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 dentry *dentry = file->f_path.dentry;
-       struct fileattr fa;
+       struct file_kattr fa;
        unsigned int flags;
        int err;
 
@@ -345,7 +345,7 @@ EXPORT_SYMBOL(ioctl_setflags);
 
 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;
 
        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 dentry *dentry = file->f_path.dentry;
-       struct fileattr fa;
+       struct file_kattr fa;
        int err;
 
        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;
        unsigned int lookup_flags = 0;
        struct file_attr fattr;
-       struct fileattr fa;
+       struct file_kattr fa;
        int error;
 
        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;
        unsigned int lookup_flags = 0;
        struct file_attr fattr;
-       struct fileattr fa;
+       struct file_kattr fa;
        int error;
 
        BUILD_BUG_ON(sizeof(struct file_attr) < FILE_ATTR_SIZE_VER0);

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index b54f4f57789f7f369a8a9505c1c9dcfc53c71cd1..501f64ceeab379f44c5143002242f74f23f42c98 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -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_compat_ioctl(struct file *file, unsigned int cmd,
                            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,
-                     struct dentry *dentry, struct fileattr *fa);
+                     struct dentry *dentry, struct file_kattr *fa);
 
 /* iomode.c */
 int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff);

diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c
index f2692f7d5932fa5f3b659cbffc69d2c9e59b2948..57032eadca6c276bd9af8ce7107bc83c39b1473e 100644 (file)
--- a/fs/fuse/ioctl.c
+++ b/fs/fuse/ioctl.c
@@ -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));
 }
 
-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 fuse_file *ff;
@@ -542,7 +542,7 @@ cleanup:
 }
 
 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 fuse_file *ff;

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index fd1147aa3891d8fcead650bd28224eb284ddde5d..65f4371f428c9a51f6436a7d64add57c78d015b0 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -155,7 +155,7 @@ static inline u32 gfs2_gfsflags_to_fsflags(struct inode *inode, u32 gfsflags)
        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 gfs2_inode *ip = GFS2_I(inode);
@@ -276,7 +276,7 @@ out:
 }
 
 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);
        u32 fsflags = fa->flags, gfsflags = 0;

diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h
index eafe123617e6980ab1494e2bfc9e7fc0fe941249..dd970e644fe050d5cb6ef5d73bbdba73437a95a6 100644 (file)
--- a/fs/gfs2/inode.h
+++ b/fs/gfs2/inode.h
@@ -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_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,
-                     struct dentry *dentry, struct fileattr *fa);
+                     struct dentry *dentry, struct file_kattr *fa);
 void gfs2_set_inode_flags(struct inode *inode);
 
 #ifdef CONFIG_GFS2_FS_LOCKING_DLM

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 2f089bff0095c0003b482c4c680adb1c005ca79a..927db2b8b17c083000be3289b3962c7c28cb51de 100644 (file)
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -489,9 +489,9 @@ int hfsplus_getattr(struct mnt_idmap *idmap, const struct path *path,
                    unsigned int query_flags);
 int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
                       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,
-                        struct dentry *dentry, struct fileattr *fa);
+                        struct dentry *dentry, struct file_kattr *fa);
 
 /* ioctl.c */
 long hfsplus_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index f331e957421783819edaae4796d0b9babe9ede22..3ec0b33808c0e47eb8264e8e774a00b1e3608139 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -654,7 +654,7 @@ out:
        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 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,
-                        struct dentry *dentry, struct fileattr *fa)
+                        struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        struct hfsplus_inode_info *hip = HFSPLUS_I(inode);

diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index f7bd7e8f5be45d4795044e019ff05000e837977c..563f148be8affbb65a52eeebad86b9f2fc82a2df 100644 (file)
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -57,7 +57,7 @@ static long jfs_map_ext2(unsigned long flags, int from)
        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));
        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,
-                    struct dentry *dentry, struct fileattr *fa)
+                    struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        struct jfs_inode_info *jfs_inode = JFS_IP(inode);

diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index ea80661597ac582d2de08bf7d8e70021c24a1d00..2c6c81c8cb9fb77bb1031e5e91a9844a01146d34 100644 (file)
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -9,9 +9,9 @@ struct fid;
 
 extern struct inode *ialloc(struct inode *, umode_t);
 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,
-                           struct dentry *dentry, struct fileattr *fa);
+                           struct dentry *dentry, struct file_kattr *fa);
 extern long jfs_ioctl(struct file *, unsigned int, unsigned long);
 extern struct inode *jfs_iget(struct super_block *, unsigned long);
 extern int jfs_commit_inode(struct inode *, int);

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index a66d62a51f77774ff5a31453a315a10ad08a418b..3288c3b4be9ec0f9b5258c8b0242bd8fc9b691dd 100644 (file)
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -118,7 +118,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,
  *
  * 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);
 
@@ -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.
  */
 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 nilfs_transaction_info ti;

diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
index cb6ed54accd7ba744b334645b2b76592ecea1d73..f466daa39440482e5368525681dc515db4dff5a1 100644 (file)
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
@@ -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);
 
 /* 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,
-                      struct dentry *dentry, struct fileattr *fa);
+                      struct dentry *dentry, struct file_kattr *fa);
 long nilfs_ioctl(struct file *, unsigned int, unsigned long);
 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 *,

diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index 7ae96fb8807a8c128ba36f1ac303b7394a0fda24..db14c92302a14b64d4b9596fd7985f6918bf179a 100644 (file)
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -62,7 +62,7 @@ static inline int o2info_coherent(struct ocfs2_info_request *req)
        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);
        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,
-                      struct dentry *dentry, struct fileattr *fa)
+                      struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        unsigned int flags = fa->flags;

diff --git a/fs/ocfs2/ioctl.h b/fs/ocfs2/ioctl.h
index 48a5fdfe87a190eb4f10a162e3db04fdbfe74743..4a1c2313b42903eb6c64969f98eefe4d62dd8cfa 100644 (file)
--- a/fs/ocfs2/ioctl.h
+++ b/fs/ocfs2/ioctl.h
@@ -11,9 +11,9 @@
 #ifndef 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,
-                      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_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);
 

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 08a6f372a352f81fae3529ff8aa7e3d27082a263..926d1659902d4b2174ed3caf4a6f371763d54d09 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -887,7 +887,7 @@ int orangefs_update_time(struct inode *inode, int flags)
        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;
        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,
-                                struct dentry *dentry, struct fileattr *fa)
+                                struct dentry *dentry, struct file_kattr *fa)
 {
        u64 val = 0;
 

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 2c646b7076d0dd0f157f68abbf0781367cd28ad6..74817e1ece19a29a92565641d96c370b154e5cdc 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -171,8 +171,8 @@ out:
 static int ovl_copy_fileattr(struct inode *inode, const struct path *old,
                             const struct path *new)
 {
-       struct fileattr oldfa = { .flags_valid = true };
-       struct fileattr newfa = { .flags_valid = true };
+       struct file_kattr oldfa = { .flags_valid = true };
+       struct file_kattr newfa = { .flags_valid = true };
        int err;
 
        err = ovl_real_fileattr_get(old, &oldfa);

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index cf3581dc103430400ddfbcd51d99ff18268aef7d..ecb9f2019395ecd01a124ad029375b1a1d13ebb5 100644 (file)
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -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
  * 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)
 {
        struct file *file;
@@ -637,7 +637,7 @@ static int ovl_security_fileattr(const struct path *realpath, struct fileattr *f
        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;
 
@@ -649,7 +649,7 @@ int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa)
 }
 
 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 path upperpath;
@@ -697,7 +697,7 @@ out:
 }
 
 /* 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_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;
 
@@ -723,7 +723,7 @@ int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *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 path realpath;

diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 8baaba0a3fe59ee8f9ca2c4cb230b66385dff8ed..e19d91f22186d45079bfb15463e6d078ae1ce4c0 100644 (file)
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -815,7 +815,7 @@ void ovl_copyattr(struct inode *to);
 
 void ovl_check_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)
 {
@@ -847,11 +847,11 @@ struct dentry *ovl_create_temp(struct ovl_fs *ofs, struct dentry *workdir,
 
 /* file.c */
 extern const struct file_operations ovl_file_operations;
-int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa);
-int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa);
-int ovl_fileattr_get(struct dentry *dentry, 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 file_kattr *fa);
+int ovl_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
 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 *ovl_file_alloc(struct file *realfile);
 void ovl_file_free(struct ovl_file *of);

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index dcccb4b4a66c7adfa818af5a2c8908de2473a44f..607860f199a8c65e487932d4014719c99ac9d8cc 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -959,7 +959,7 @@ void ovl_check_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);
        char buf[OVL_PROTATTR_MAX];

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 2c99349cf537532a91f2f60e5825f5ca6310a89a..79536b2e3d7a1a1958f1b5cfc949c1498e153781 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -130,7 +130,7 @@ static int setflags(struct inode *inode, int flags)
        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);
        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,
-                      struct dentry *dentry, struct fileattr *fa)
+                      struct dentry *dentry, struct file_kattr *fa)
 {
        struct inode *inode = d_inode(dentry);
        int flags = fa->flags;

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 256dbaeeb0de173885c41350479065ca39c71a05..5db45c9e26ee0e4e99a93f221e251977f6d6cc45 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -2073,9 +2073,9 @@ int ubifs_recover_size(struct ubifs_info *c, bool in_place);
 void ubifs_destroy_size_tree(struct ubifs_info *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,
-                      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);
 void ubifs_set_inode_flags(struct inode *inode);
 #ifdef CONFIG_COMPAT

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

diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
index 12124946f347e97271746c21ce356b47ea22ef5b..f5ed5cf9d3df65258ceacb8db74c86e67e45ab06 100644 (file)
--- a/fs/xfs/xfs_ioctl.h
+++ b/fs/xfs/xfs_ioctl.h
@@ -17,13 +17,13 @@ xfs_ioc_swapext(
 extern int
 xfs_fileattr_get(
        struct dentry           *dentry,
-       struct fileattr         *fa);
+       struct file_kattr       *fa);
 
 extern int
 xfs_fileattr_set(
        struct mnt_idmap        *idmap,
        struct dentry           *dentry,
-       struct fileattr         *fa);
+       struct file_kattr       *fa);
 
 extern long
 xfs_file_ioctl(

diff --git a/include/linux/fileattr.h b/include/linux/fileattr.h
index e2a2f4ae242d1abcc553e896d184992a82081d15..f89dcfad3f8f36b4d2c48a8300d08d9d4c35ef0f 100644 (file)
--- a/include/linux/fileattr.h
+++ b/include/linux/fileattr.h
@@ -40,7 +40,7 @@
  * is handled by the VFS helpers, so filesystems are free to implement just one
  * or both of these sub-interfaces.
  */
-struct fileattr {
+struct file_kattr {
        u32     flags;          /* flags (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS) */
        /* struct fsxattr: */
        u32     fsx_xflags;     /* xflags field value (get/set) */
@@ -53,10 +53,10 @@ struct fileattr {
        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_flags(struct fileattr *fa, u32 flags);
+void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags);
+void fileattr_fill_flags(struct file_kattr *fa, u32 flags);
 
 /**
  * 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
  * ->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 &&
                ((fa->fsx_xflags & ~FS_XFLAG_COMMON) || fa->fsx_extsize != 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,
-                    struct fileattr *fa);
+                    struct file_kattr *fa);
 int ioctl_getflags(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);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 96c7925a655199ebdfefafa587ea5ae3e3665867..0c58617645ea0d142c1227a22058e7dec3825d41 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -80,7 +80,7 @@ struct fsnotify_mark_connector;
 struct fsnotify_sb_info;
 struct fs_context;
 struct fs_parameter_spec;
-struct fileattr;
+struct file_kattr;
 struct iomap_ops;
 
 extern void __init inode_init(void);
@@ -2254,8 +2254,8 @@ struct inode_operations {
        int (*set_acl)(struct mnt_idmap *, struct dentry *,
                       struct posix_acl *, int);
        int (*fileattr_set)(struct mnt_idmap *idmap,
-                           struct dentry *dentry, struct fileattr *fa);
-       int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);
+                           struct dentry *dentry, struct file_kattr *fa);
+       int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
        struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
 } ____cacheline_aligned;
 

diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
index 9600a4350e791f47006720765c199e35d3abafd4..fd11fffdd3c38045eafe6ebd20b77a1fc8a7a74f 100644 (file)
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -157,8 +157,8 @@ LSM_HOOK(int, 0, inode_removexattr, struct mnt_idmap *idmap,
         struct dentry *dentry, const char *name)
 LSM_HOOK(void, LSM_RET_VOID, inode_post_removexattr, struct dentry *dentry,
         const char *name)
-LSM_HOOK(int, 0, inode_file_setattr, struct dentry *dentry, struct fileattr *fa)
-LSM_HOOK(int, 0, inode_file_getattr, 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 file_kattr *fa)
 LSM_HOOK(int, 0, inode_set_acl, struct mnt_idmap *idmap,
         struct dentry *dentry, const char *acl_name, struct posix_acl *kacl)
 LSM_HOOK(void, LSM_RET_VOID, inode_post_set_acl, struct dentry *dentry,

diff --git a/include/linux/security.h b/include/linux/security.h
index 9ed0d0e0c81f115648fb1d2937255001a8411928..b95b5540c429a86dd47d59f83e9d2e12a5d06410 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -452,9 +452,9 @@ int security_inode_removexattr(struct mnt_idmap *idmap,
                               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,
-                             struct fileattr *fa);
+                             struct file_kattr *fa);
 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_killpriv(struct mnt_idmap *idmap, struct dentry *dentry);
 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,
-                                             struct fileattr *fa)
+                                             struct file_kattr *fa)
 {
        return 0;
 }
 
 static inline int security_inode_file_getattr(struct dentry *dentry,
-                                             struct fileattr *fa)
+                                             struct file_kattr *fa)
 {
        return 0;
 }

diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index 9663dbdda1811a000fa9bbb6aa66de16afdc9f0a..6e136c9c6a22b86338b4613db583849c4b0e43f2 100644 (file)
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -151,7 +151,7 @@ struct fsxattr {
 /*
  * 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
  * be versioned based on the size.
  */

diff --git a/mm/shmem.c b/mm/shmem.c
index 0c5fb4ffa03aadf8397002f0a55f2e96b8eec5c7..6311fe35c5777539c64dc7051d871781a8a42e89 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -4183,7 +4183,7 @@ static const char *shmem_get_link(struct dentry *dentry, struct inode *inode,
 
 #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));
 
@@ -4193,7 +4193,7 @@ static int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 }
 
 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 shmem_inode_info *info = SHMEM_I(inode);

diff --git a/security/security.c b/security/security.c
index 711b4de40b8d36497692041b33f6e8da87cf268f..a5766cbf6f7cc613ebd45c268aa3e38a53543dfe 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -2632,7 +2632,7 @@ void security_inode_post_removexattr(struct dentry *dentry, const char *name)
  *
  * 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);
 }
@@ -2647,7 +2647,7 @@ int security_inode_file_setattr(struct dentry *dentry, struct fileattr *fa)
  *
  * 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);
 }

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index be7aca2269fab5e255acd351ecf79ebb0c465309..0dadce2267c150ab9f72cf3f45a26b0a4eb04bfd 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3481,13 +3481,13 @@ static int selinux_inode_removexattr(struct mnt_idmap *idmap,
 }
 
 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);
 }
 
 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);
 }