2 files changed, 9 insertions, 1 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 1f9da7a5ad0d..3959f08279e6 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2578,8 +2578,13 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
 #if BITS_PER_LONG == 32
         inarg.flags |= FUSE_IOCTL_32BIT;
 #else
-        if (flags & FUSE_IOCTL_COMPAT)
+        if (flags & FUSE_IOCTL_COMPAT) {
                 inarg.flags |= FUSE_IOCTL_32BIT;
+#ifdef CONFIG_X86_X32
+                if (in_x32_syscall())
+                        inarg.flags |= FUSE_IOCTL_COMPAT_X32;
+#endif
+        }
 #endif
 
         /* assume all the iovs returned by client always fits in a page */
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
index c2bece466520..19fb55e3c73e 100644
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -129,6 +129,7 @@
  *
  *  7.30
  *  - add FUSE_EXPLICIT_INVAL_DATA
+ *  - add FUSE_IOCTL_COMPAT_X32
  */
 
 #ifndef _LINUX_FUSE_H
@@ -343,6 +344,7 @@ struct fuse_file_lock {
  * FUSE_IOCTL_RETRY: retry with new iovecs
  * FUSE_IOCTL_32BIT: 32bit ioctl
  * FUSE_IOCTL_DIR: is a directory
+ * FUSE_IOCTL_COMPAT_X32: x32 compat ioctl on 64bit machine (64bit time_t)
  *
  * FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
  */
@@ -351,6 +353,7 @@ struct fuse_file_lock {
 #define FUSE_IOCTL_RETRY        (1 << 2)
 #define FUSE_IOCTL_32BIT        (1 << 3)
 #define FUSE_IOCTL_DIR          (1 << 4)
+#define FUSE_IOCTL_COMPAT_X32   (1 << 5)
 
 #define FUSE_IOCTL_MAX_IOV      256