summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-02-26 15:38:34 +0100
committerDavid Sterba <dsterba@suse.com>2016-02-26 15:38:34 +0100
commitf5bc27c71a1b0741cb93dbec0f216b012b21d93f (patch)
treefaff0fa1c1244d603a892525ee1391747c637677 /fs/btrfs/ioctl.c
parentfa695b01bceabc40be3267d309ca8a663de53d7a (diff)
parentd5131b658c2e906da11603da5d3cb4c3a445331d (diff)
downloadop-kernel-dev-f5bc27c71a1b0741cb93dbec0f216b012b21d93f.zip
op-kernel-dev-f5bc27c71a1b0741cb93dbec0f216b012b21d93f.tar.gz
Merge branch 'dev/control-ioctl' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index c1193b0..86249cf 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -5257,8 +5257,7 @@ out_unlock:
.compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \
.incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix }
-static 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),
@@ -5537,7 +5536,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:
OpenPOWER on IntegriCloud