Merge branch 'for-linus' into for-next

[linux.git] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 9ae90d728c0ffa590b60e1e196675707ed0a78b0..358ea2ecf36b2abfc300a94c9488755390d16d7d 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -185,15 +185,27 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
        /* handled by some ->ioctl(); always a pointer to int */
        case FIONREAD:
                goto found_handler;
-       /* these two get messy on amd64 due to alignment differences */
+       /* these get messy on amd64 due to alignment differences */
 #if defined(CONFIG_X86_64)
        case FS_IOC_RESVSP_32:
        case FS_IOC_RESVSP64_32:
-               error = compat_ioctl_preallocate(f.file, compat_ptr(arg));
+               error = compat_ioctl_preallocate(f.file, 0, compat_ptr(arg));
+               goto out_fput;
+       case FS_IOC_UNRESVSP_32:
+       case FS_IOC_UNRESVSP64_32:
+               error = compat_ioctl_preallocate(f.file, FALLOC_FL_PUNCH_HOLE,
+                               compat_ptr(arg));
+               goto out_fput;
+       case FS_IOC_ZERO_RANGE_32:
+               error = compat_ioctl_preallocate(f.file, FALLOC_FL_ZERO_RANGE,
+                               compat_ptr(arg));
                goto out_fput;
 #else
        case FS_IOC_RESVSP:
        case FS_IOC_RESVSP64:
+       case FS_IOC_UNRESVSP:
+       case FS_IOC_UNRESVSP64:
+       case FS_IOC_ZERO_RANGE:
                goto found_handler;
 #endif