leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.10

Browse Source
This commit is contained in:
Chris Mason 2017-02-10 12:53:18 -08:00
commit f3c7bfbda7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/ioctl.c
View File

@ -5665,6 +5665,10 @@ long btrfs_ioctl(struct file *file, unsigned int
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 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) { switch (cmd) {
case FS_IOC32_GETFLAGS: case FS_IOC32_GETFLAGS:
cmd = FS_IOC_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: case FS_IOC32_GETVERSION:
cmd = FS_IOC_GETVERSION; cmd = FS_IOC_GETVERSION;
break; break;
default:
return -ENOIOCTLCMD;
} }
return btrfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg)); return btrfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));