diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
| commit | f5bc27c71a1b0741cb93dbec0f216b012b21d93f (patch) | |
| tree | faff0fa1c1244d603a892525ee1391747c637677 /fs/btrfs/super.c | |
| parent | Merge branch 'misc-4.6' into for-chris-4.6 (diff) | |
| parent | btrfs: drop unused argument in btrfs_ioctl_get_supported_features (diff) | |
| download | linux-f5bc27c71a1b0741cb93dbec0f216b012b21d93f.tar.xz linux-f5bc27c71a1b0741cb93dbec0f216b012b21d93f.zip | |
Merge branch 'dev/control-ioctl' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index bf75200c6f86..a958f625793b 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2190,6 +2190,9 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, break; ret = !(fs_devices->num_devices == fs_devices->total_devices); break; + case BTRFS_IOC_GET_SUPPORTED_FEATURES: + ret = btrfs_ioctl_get_supported_features((void __user*)arg); + break; } kfree(vol); |