diff options
| author | Chris Mason | 2017-02-10 21:53:18 +0100 |
|---|---|---|
| committer | Chris Mason | 2017-02-10 21:53:18 +0100 |
| commit | f3c7bfbda7ce03c603b4292efddc944228dccc55 (patch) | |
| tree | a82a639c63ee3a78259c9ee909d19c2c48d9d3d3 | |
| parent | Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations (diff) | |
| parent | btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls (diff) | |
| download | kernel-qcow2-linux-f3c7bfbda7ce03c603b4292efddc944228dccc55.tar.gz kernel-qcow2-linux-f3c7bfbda7ce03c603b4292efddc944228dccc55.tar.xz kernel-qcow2-linux-f3c7bfbda7ce03c603b4292efddc944228dccc55.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.10
| -rw-r--r-- | fs/btrfs/ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 0a6902555e65..0c77cad89e87 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -5665,6 +5665,10 @@ long btrfs_ioctl(struct file *file, unsigned int #ifdef CONFIG_COMPAT long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { + /* + * These all access 32-bit values anyway so no further + * handling is necessary. + */ switch (cmd) { case FS_IOC32_GETFLAGS: cmd = FS_IOC_GETFLAGS; @@ -5675,8 +5679,6 @@ long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case FS_IOC32_GETVERSION: cmd = FS_IOC_GETVERSION; break; - default: - return -ENOIOCTLCMD; } return btrfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg)); |