]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: drop unused argument in btrfs_ioctl_get_supported_features
authorDavid Sterba <dsterba@suse.com>
Wed, 17 Feb 2016 14:26:27 +0000 (15:26 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 23 Feb 2016 11:56:35 +0000 (12:56 +0100)
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.h
fs/btrfs/ioctl.c
fs/btrfs/super.c

index 47bc50fd4f55fee3dbc70450a650b6a43127739f..82ce847318ae783cd01e0ff5e6a50fc1ecdc7945 100644 (file)
@@ -4089,7 +4089,7 @@ void btrfs_test_inode_set_ops(struct inode *inode);
 
 /* ioctl.c */
 long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg);
+int btrfs_ioctl_get_supported_features(void __user *arg);
 void btrfs_update_iflags(struct inode *inode);
 void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
 int btrfs_is_empty_uuid(u8 *uuid);
index f4c6ed5c530069f5fa3b7b9419c93659f829f449..dcda7ea1e928915e7594acd6cadc7482c80a2b3b 100644 (file)
@@ -5187,7 +5187,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
          .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \
          .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix }
 
-int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg)
+int btrfs_ioctl_get_supported_features(void __user *arg)
 {
        static const struct btrfs_ioctl_feature_flags features[3] = {
                INIT_FEATURE_FLAGS(SUPP),
@@ -5466,7 +5466,7 @@ long btrfs_ioctl(struct file *file, unsigned int
        case BTRFS_IOC_SET_FSLABEL:
                return btrfs_ioctl_set_fslabel(file, argp);
        case BTRFS_IOC_GET_SUPPORTED_FEATURES:
-               return btrfs_ioctl_get_supported_features(file, argp);
+               return btrfs_ioctl_get_supported_features(argp);
        case BTRFS_IOC_GET_FEATURES:
                return btrfs_ioctl_get_features(file, argp);
        case BTRFS_IOC_SET_FEATURES:
index dda6f64dfd738e4619f540aecf9915363573508b..737e6a85c71e15564b3ce4a8aedd29814c7aeaeb 100644 (file)
@@ -2164,8 +2164,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
                ret = !(fs_devices->num_devices == fs_devices->total_devices);
                break;
        case BTRFS_IOC_GET_SUPPORTED_FEATURES:
-               ret = btrfs_ioctl_get_supported_features(NULL,
-                               (void __user*)arg);
+               ret = btrfs_ioctl_get_supported_features((void __user*)arg);
                break;
        }