Unverified Commit ca115d7e authored by Christian Brauner's avatar Christian Brauner
Browse files

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: default avatarChristian Brauner <brauner@kernel.org>
parent 66241657

Documentation/filesystems/locking.rst

+2 −2
Original line number Diff line number Diff line
@@ -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);

Documentation/filesystems/vfs.rst

+2 −2
Original line number Diff line number Diff line
@@ -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);

	};

fs/bcachefs/fs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/ioctl.h

+3 −3
Original line number Diff line number Diff line
@@ -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,