aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/ioctl.c4
-rw-r--r--fs/btrfs/super.c3
3 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 47bc50fd4f55..82ce847318ae 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -4089,7 +4089,7 @@ void btrfs_test_inode_set_ops(struct inode *inode);
4089 4089
4090/* ioctl.c */ 4090/* ioctl.c */
4091long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); 4091long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
4092int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg); 4092int btrfs_ioctl_get_supported_features(void __user *arg);
4093void btrfs_update_iflags(struct inode *inode); 4093void btrfs_update_iflags(struct inode *inode);
4094void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); 4094void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
4095int btrfs_is_empty_uuid(u8 *uuid); 4095int btrfs_is_empty_uuid(u8 *uuid);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index f4c6ed5c5300..dcda7ea1e928 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -5187,7 +5187,7 @@ out_unlock:
5187 .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \ 5187 .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \
5188 .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix } 5188 .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix }
5189 5189
5190int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg) 5190int btrfs_ioctl_get_supported_features(void __user *arg)
5191{ 5191{
5192 static const struct btrfs_ioctl_feature_flags features[3] = { 5192 static const struct btrfs_ioctl_feature_flags features[3] = {
5193 INIT_FEATURE_FLAGS(SUPP), 5193 INIT_FEATURE_FLAGS(SUPP),
@@ -5466,7 +5466,7 @@ long btrfs_ioctl(struct file *file, unsigned int
5466 case BTRFS_IOC_SET_FSLABEL: 5466 case BTRFS_IOC_SET_FSLABEL:
5467 return btrfs_ioctl_set_fslabel(file, argp); 5467 return btrfs_ioctl_set_fslabel(file, argp);
5468 case BTRFS_IOC_GET_SUPPORTED_FEATURES: 5468 case BTRFS_IOC_GET_SUPPORTED_FEATURES:
5469 return btrfs_ioctl_get_supported_features(file, argp); 5469 return btrfs_ioctl_get_supported_features(argp);
5470 case BTRFS_IOC_GET_FEATURES: 5470 case BTRFS_IOC_GET_FEATURES:
5471 return btrfs_ioctl_get_features(file, argp); 5471 return btrfs_ioctl_get_features(file, argp);
5472 case BTRFS_IOC_SET_FEATURES: 5472 case BTRFS_IOC_SET_FEATURES:
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index dda6f64dfd73..737e6a85c71e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2164,8 +2164,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
2164 ret = !(fs_devices->num_devices == fs_devices->total_devices); 2164 ret = !(fs_devices->num_devices == fs_devices->total_devices);
2165 break; 2165 break;
2166 case BTRFS_IOC_GET_SUPPORTED_FEATURES: 2166 case BTRFS_IOC_GET_SUPPORTED_FEATURES:
2167 ret = btrfs_ioctl_get_supported_features(NULL, 2167 ret = btrfs_ioctl_get_supported_features((void __user*)arg);
2168 (void __user*)arg);
2169 break; 2168 break;
2170 } 2169 }
2171 2170