Skip to content

Commit ca115d7

Browse files
braunerbrauner
committed
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>
1 parent 6624165 commit ca115d7

43 files changed

Lines changed: 122 additions & 122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/filesystems/locking.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ prototypes::
8787
int (*tmpfile) (struct mnt_idmap *, struct inode *,
8888
struct file *, umode_t);
8989
int (*fileattr_set)(struct mnt_idmap *idmap,
90-
struct dentry *dentry, struct fileattr *fa);
91-
int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);
90+
struct dentry *dentry, struct file_kattr *fa);
91+
int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
9292
struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);
9393
struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
9494

‎Documentation/filesystems/vfs.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@ As of kernel 2.6.22, the following members are defined:
515515
struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);
516516
int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);
517517
int (*fileattr_set)(struct mnt_idmap *idmap,
518-
struct dentry *dentry, struct fileattr *fa);
519-
int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);
518+
struct dentry *dentry, struct file_kattr *fa);
519+
int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);
520520
struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
521521
};
522522

‎fs/bcachefs/fs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,7 @@ static const __maybe_unused unsigned bch_flags_to_xflags[] = {
16191619
};
16201620

16211621
static int bch2_fileattr_get(struct dentry *dentry,
1622-
struct fileattr *fa)
1622+
struct file_kattr *fa)
16231623
{
16241624
struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
16251625
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,
16821682

16831683
static int bch2_fileattr_set(struct mnt_idmap *idmap,
16841684
struct dentry *dentry,
1685-
struct fileattr *fa)
1685+
struct file_kattr *fa)
16861686
{
16871687
struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
16881688
struct bch_fs *c = inode->v.i_sb->s_fs_info;

‎fs/btrfs/ioctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int btrfs_check_ioctl_vol_args2_subvol_name(const struct btrfs_ioctl_vol_
245245
* Set flags/xflags from the internal inode flags. The remaining items of
246246
* fsxattr are zeroed.
247247
*/
248-
int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
248+
int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
249249
{
250250
const struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));
251251

@@ -254,7 +254,7 @@ int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
254254
}
255255

256256
int btrfs_fileattr_set(struct mnt_idmap *idmap,
257-
struct dentry *dentry, struct fileattr *fa)
257+
struct dentry *dentry, struct file_kattr *fa)
258258
{
259259
struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));
260260
struct btrfs_root *root = inode->root;

‎fs/btrfs/ioctl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
struct file;
99
struct dentry;
1010
struct mnt_idmap;
11-
struct fileattr;
11+
struct file_kattr;
1212
struct io_uring_cmd;
1313
struct btrfs_inode;
1414
struct btrfs_fs_info;
1515
struct btrfs_ioctl_balance_args;
1616

1717
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
1818
long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
19-
int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);
19+
int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
2020
int btrfs_fileattr_set(struct mnt_idmap *idmap,
21-
struct dentry *dentry, struct fileattr *fa);
21+
struct dentry *dentry, struct file_kattr *fa);
2222
int btrfs_ioctl_get_supported_features(void __user *arg);
2323
void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode);
2424
void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,

‎fs/ecryptfs/inode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,13 +1124,13 @@ static int ecryptfs_removexattr(struct dentry *dentry, struct inode *inode,
11241124
return rc;
11251125
}
11261126

1127-
static int ecryptfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
1127+
static int ecryptfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
11281128
{
11291129
return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa);
11301130
}
11311131

11321132
static int ecryptfs_fileattr_set(struct mnt_idmap *idmap,
1133-
struct dentry *dentry, struct fileattr *fa)
1133+
struct dentry *dentry, struct file_kattr *fa)
11341134
{
11351135
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
11361136
int rc;

‎fs/efivarfs/inode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const struct inode_operations efivarfs_dir_inode_operations = {
138138
};
139139

140140
static int
141-
efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
141+
efivarfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
142142
{
143143
unsigned int i_flags;
144144
unsigned int flags = 0;
@@ -154,7 +154,7 @@ efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
154154

155155
static int
156156
efivarfs_fileattr_set(struct mnt_idmap *idmap,
157-
struct dentry *dentry, struct fileattr *fa)
157+
struct dentry *dentry, struct file_kattr *fa)
158158
{
159159
unsigned int i_flags = 0;
160160

‎fs/ext2/ext2.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,9 +750,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
750750
u64 start, u64 len);
751751

752752
/* ioctl.c */
753-
extern int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa);
753+
extern int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
754754
extern int ext2_fileattr_set(struct mnt_idmap *idmap,
755-
struct dentry *dentry, struct fileattr *fa);
755+
struct dentry *dentry, struct file_kattr *fa);
756756
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
757757
extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);
758758

‎fs/ext2/ioctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/uaccess.h>
1919
#include <linux/fileattr.h>
2020

21-
int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
21+
int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
2222
{
2323
struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));
2424

@@ -28,7 +28,7 @@ int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
2828
}
2929

3030
int ext2_fileattr_set(struct mnt_idmap *idmap,
31-
struct dentry *dentry, struct fileattr *fa)
31+
struct dentry *dentry, struct file_kattr *fa)
3232
{
3333
struct inode *inode = d_inode(dentry);
3434
struct ext2_inode_info *ei = EXT2_I(inode);

‎fs/ext4/ext4.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,8 +3103,8 @@ extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
31033103
extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
31043104
extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);
31053105
int ext4_fileattr_set(struct mnt_idmap *idmap,
3106-
struct dentry *dentry, struct fileattr *fa);
3107-
int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa);
3106+
struct dentry *dentry, struct file_kattr *fa);
3107+
int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
31083108
extern void ext4_reset_inode_seed(struct inode *inode);
31093109
int ext4_update_overhead(struct super_block *sb, bool force);
31103110
int ext4_force_shutdown(struct super_block *sb, u32 flags);

0 commit comments

Comments
 (0)