btrfs: ioctl: Try to use btrfs_fs_info instead of *file
PATCH 1/1 btrfs: ioctl: Try to use btrfs_fs_info instead of *file
Some functions are doing some bikeshedding to reach the btrfs_fs_info struct. Change these functions to receive a btrfs_fs_info struct instead of a *file.
---
The kernel survived btrfs-progs tests with this patch applied.
fs/btrfs/ioctl.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-)
fs/btrfs/ioctl.c +15 -21
@@ -479,10 +479,9 @@ static int btrfs_ioctl_getversion(struct file *file, int __user *arg)return put_user (inode->i_generation, arg); } -static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg) +static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_device *device;struct request_queue *q;struct fstrim_range range;
@@ -4960,10 +4959,9 @@ static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)return ret; } -static long btrfs_ioctl_quota_rescan_status (struct file *file,void __user *arg) +static long btrfs_ioctl_quota_rescan_status (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_quota_rescan_args *qsa;int ret =0 ;
@@ -4986,11 +4984,9 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)return ret; } -static long btrfs_ioctl_quota_rescan_wait (struct file *file,void __user *arg) +static long btrfs_ioctl_quota_rescan_wait (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -if (!capable (CAP_SYS_ADMIN ))return -EPERM ;
@@ -5162,10 +5158,9 @@ static long btrfs_ioctl_set_received_subvol(struct file *file,return ret; } -static int btrfs_ioctl_get_fslabel (struct file *file,void __user *arg) +static int btrfs_ioctl_get_fslabel (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);size_t len;int ret;char label[BTRFS_LABEL_SIZE ];
@@ -5249,10 +5244,9 @@ int btrfs_ioctl_get_supported_features(void __user *arg)return 0 ; } -static int btrfs_ioctl_get_features (struct file *file,void __user *arg) +static int btrfs_ioctl_get_features (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_super_block *super_block = fs_info->super_copy;struct btrfs_ioctl_feature_flags features;
@@ -5453,11 +5447,11 @@ long btrfs_ioctl(struct file *file, unsigned intcase FS_IOC_GETVERSION :return btrfs_ioctl_getversion (file, argp);case FS_IOC_GETFSLABEL : -return btrfs_ioctl_get_fslabel (file, argp); +return btrfs_ioctl_get_fslabel (fs_info, argp);case FS_IOC_SETFSLABEL :return btrfs_ioctl_set_fslabel (file, argp);case FITRIM : -return btrfs_ioctl_fitrim (file, argp); +return btrfs_ioctl_fitrim (fs_info, argp);case BTRFS_IOC_SNAP_CREATE :return btrfs_ioctl_snap_create (file, argp,0 );case BTRFS_IOC_SNAP_CREATE_V2 :
@@ -5562,15 +5556,15 @@ long btrfs_ioctl(struct file *file, unsigned intcase BTRFS_IOC_QUOTA_RESCAN :return btrfs_ioctl_quota_rescan (file, argp);case BTRFS_IOC_QUOTA_RESCAN_STATUS : -return btrfs_ioctl_quota_rescan_status (file, argp); +return btrfs_ioctl_quota_rescan_status (fs_info, argp);case BTRFS_IOC_QUOTA_RESCAN_WAIT : -return btrfs_ioctl_quota_rescan_wait (file, argp); +return btrfs_ioctl_quota_rescan_wait (fs_info, argp);case BTRFS_IOC_DEV_REPLACE :return btrfs_ioctl_dev_replace (fs_info, argp);case BTRFS_IOC_GET_SUPPORTED_FEATURES :return btrfs_ioctl_get_supported_features (argp);case BTRFS_IOC_GET_FEATURES : -return btrfs_ioctl_get_features (file, argp); +return btrfs_ioctl_get_features (fs_info, argp);case BTRFS_IOC_SET_FEATURES :return btrfs_ioctl_set_features (file, argp);case FS_IOC_FSGETXATTR :
Signature · 1 line
2.23.0
(cleaned up cc list - I didn't want to clutter others inboxes with my review).
Quoted 5 lines · Marcos Paulo de Souza
Some functions are doing some bikeshedding to reach the
btrfs_fs_infostruct. Change these functions to receive abtrfs_fs_infostruct instead of a *file.Signed-off-by Marcos Paulo de Souza <[email protected]>
Thanks for the fix.
Quoted 5 lines · Marcos Paulo de Souza
Some functions are doing some bikeshedding to reach the
btrfs_fs_infostruct. Change these functions to receive abtrfs_fs_infostruct instead of a *file.Signed-off-by Marcos Paulo de Souza <[email protected]>
Changes seems pretty self-explanatory so :
Quoted 110 lines
---
The kernel survived btrfs-progs tests with this patch applied.fs/btrfs/ioctl.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-)fs/btrfs/ioctl.c +15
-21@@ -479,10 +479,9 @@ static int btrfs_ioctl_getversion(struct file *file, int __user *arg)return put_user (inode->i_generation, arg); } -static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg) +static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_device *device;struct request_queue *q;struct fstrim_range range;@@ -4960,10 +4959,9 @@ static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)return ret; } -static long btrfs_ioctl_quota_rescan_status (struct file *file,void __user *arg) +static long btrfs_ioctl_quota_rescan_status (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_quota_rescan_args *qsa;int ret =0 ;@@ -4986,11 +4984,9 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)return ret; } -static long btrfs_ioctl_quota_rescan_wait (struct file *file,void __user *arg) +static long btrfs_ioctl_quota_rescan_wait (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -if (!capable (CAP_SYS_ADMIN ))return -EPERM ;@@ -5162,10 +5158,9 @@ static long btrfs_ioctl_set_received_subvol(struct file *file,return ret; } -static int btrfs_ioctl_get_fslabel (struct file *file,void __user *arg) +static int btrfs_ioctl_get_fslabel (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);size_t len;int ret;char label[BTRFS_LABEL_SIZE ];@@ -5249,10 +5244,9 @@ int btrfs_ioctl_get_supported_features(void __user *arg)return 0 ; } -static int btrfs_ioctl_get_features (struct file *file,void __user *arg) +static int btrfs_ioctl_get_features (struct btrfs_fs_info *fs_info, +void __user *arg) { -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_super_block *super_block = fs_info->super_copy;struct btrfs_ioctl_feature_flags features;@@ -5453,11 +5447,11 @@ long btrfs_ioctl(struct file *file, unsigned intcase FS_IOC_GETVERSION :return btrfs_ioctl_getversion (file, argp);case FS_IOC_GETFSLABEL : -return btrfs_ioctl_get_fslabel (file, argp); +return btrfs_ioctl_get_fslabel (fs_info, argp);case FS_IOC_SETFSLABEL :return btrfs_ioctl_set_fslabel (file, argp);case FITRIM : -return btrfs_ioctl_fitrim (file, argp); +return btrfs_ioctl_fitrim (fs_info, argp);case BTRFS_IOC_SNAP_CREATE :return btrfs_ioctl_snap_create (file, argp,0 );case BTRFS_IOC_SNAP_CREATE_V2 :@@ -5562,15 +5556,15 @@ long btrfs_ioctl(struct file *file, unsigned intcase BTRFS_IOC_QUOTA_RESCAN :return btrfs_ioctl_quota_rescan (file, argp);case BTRFS_IOC_QUOTA_RESCAN_STATUS : -return btrfs_ioctl_quota_rescan_status (file, argp); +return btrfs_ioctl_quota_rescan_status (fs_info, argp);case BTRFS_IOC_QUOTA_RESCAN_WAIT : -return btrfs_ioctl_quota_rescan_wait (file, argp); +return btrfs_ioctl_quota_rescan_wait (fs_info, argp);case BTRFS_IOC_DEV_REPLACE :return btrfs_ioctl_dev_replace (fs_info, argp);case BTRFS_IOC_GET_SUPPORTED_FEATURES :return btrfs_ioctl_get_supported_features (argp);case BTRFS_IOC_GET_FEATURES : -return btrfs_ioctl_get_features (file, argp); +return btrfs_ioctl_get_features (fs_info, argp);case BTRFS_IOC_SET_FEATURES :return btrfs_ioctl_set_features (file, argp);case FS_IOC_FSGETXATTR :
Quoted 3 lines · Marcos Paulo de Souza
Some functions are doing some bikeshedding to reach the
btrfs_fs_infostruct. Change these functions to receive abtrfs_fs_infostruct instead of a *file.
Makes sense, thanks. Added to msic-next.