2 files changed, 90 insertions, 31 deletions

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 350fe9767bb..162e5defe68 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -1,6 +1,6 @@
 /*
     FUSE: Filesystem in Userspace
-    Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>
+    Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>
 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
@@ -20,29 +20,27 @@
  *
  * 7.10
  *  - add nonseekable open flag
+ *
+ * 7.11
+ *  - add IOCTL message
+ *  - add unsolicited notification support
+ *  - add POLL message and NOTIFY_POLL notification
  */
 
 #ifndef _LINUX_FUSE_H
 #define _LINUX_FUSE_H
 
-#include <asm/types.h>
-#include <linux/major.h>
+#include <linux/types.h>
 
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 10
+#define FUSE_KERNEL_MINOR_VERSION 11
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
 
-/** The major number of the fuse character device */
-#define FUSE_MAJOR MISC_MAJOR
-
-/** The minor number of the fuse character device */
-#define FUSE_MINOR 229
-
 /* Make sure all structures are padded to 64bit boundary, so 32bit
    userspace works under 64bit kernels */
 
@@ -151,6 +149,28 @@ struct fuse_file_lock {
  */
 #define FUSE_READ_LOCKOWNER     (1 << 1)
 
+/**
+ * Ioctl flags
+ *
+ * FUSE_IOCTL_COMPAT: 32bit compat ioctl on 64bit machine
+ * FUSE_IOCTL_UNRESTRICTED: not restricted to well-formed ioctls, retry allowed
+ * FUSE_IOCTL_RETRY: retry with new iovecs
+ *
+ * FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
+ */
+#define FUSE_IOCTL_COMPAT       (1 << 0)
+#define FUSE_IOCTL_UNRESTRICTED (1 << 1)
+#define FUSE_IOCTL_RETRY        (1 << 2)
+
+#define FUSE_IOCTL_MAX_IOV      256
+
+/**
+ * Poll flags
+ *
+ * FUSE_POLL_SCHEDULE_NOTIFY: request poll notify
+ */
+#define FUSE_POLL_SCHEDULE_NOTIFY (1 << 0)
+
 enum fuse_opcode {
         FUSE_LOOKUP        = 1,
         FUSE_FORGET        = 2,  /* no reply */
@@ -188,6 +208,13 @@ enum fuse_opcode {
         FUSE_INTERRUPT     = 36,
         FUSE_BMAP          = 37,
         FUSE_DESTROY       = 38,
+        FUSE_IOCTL         = 39,
+        FUSE_POLL          = 40,
+};
+
+enum fuse_notify_code {
+        FUSE_NOTIFY_POLL   = 1,
+        FUSE_NOTIFY_CODE_MAX,
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
@@ -388,6 +415,38 @@ struct fuse_bmap_out {
         __u64   block;
 };
 
+struct fuse_ioctl_in {
+        __u64   fh;
+        __u32   flags;
+        __u32   cmd;
+        __u64   arg;
+        __u32   in_size;
+        __u32   out_size;
+};
+
+struct fuse_ioctl_out {
+        __s32   result;
+        __u32   flags;
+        __u32   in_iovs;
+        __u32   out_iovs;
+};
+
+struct fuse_poll_in {
+        __u64   fh;
+        __u64   kh;
+        __u32   flags;
+        __u32   padding;
+};
+
+struct fuse_poll_out {
+        __u32   revents;
+        __u32   padding;
+};
+
+struct fuse_notify_poll_wakeup_out {
+        __u64   kh;
+};
+
 struct fuse_in_header {
         __u32   len;
         __u32   opcode;
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 26433ec520b..a820f816a49 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -3,33 +3,33 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
-#define PSMOUSE_MINOR  1
-#define MS_BUSMOUSE_MINOR 2
-#define ATIXL_BUSMOUSE_MINOR 3
-/*#define AMIGAMOUSE_MINOR 4    FIXME OBSOLETE */
-#define ATARIMOUSE_MINOR 5
-#define SUN_MOUSE_MINOR 6
-#define APOLLO_MOUSE_MINOR 7
-#define PC110PAD_MINOR 9
-/*#define ADB_MOUSE_MINOR 10    FIXME OBSOLETE */
+#define PSMOUSE_MINOR           1
+#define MS_BUSMOUSE_MINOR       2
+#define ATIXL_BUSMOUSE_MINOR    3
+/*#define AMIGAMOUSE_MINOR      4       FIXME OBSOLETE */
+#define ATARIMOUSE_MINOR        5
+#define SUN_MOUSE_MINOR         6
+#define APOLLO_MOUSE_MINOR      7
+#define PC110PAD_MINOR          9
+/*#define ADB_MOUSE_MINOR       10      FIXME OBSOLETE */
 #define WATCHDOG_MINOR          130     /* Watchdog timer     */
 #define TEMP_MINOR              131     /* Temperature Sensor */
-#define RTC_MINOR 135
+#define RTC_MINOR               135
 #define EFI_RTC_MINOR           136     /* EFI Time services */
-#define SUN_OPENPROM_MINOR 139
+#define SUN_OPENPROM_MINOR      139
 #define DMAPI_MINOR             140     /* DMAPI */
-#define NVRAM_MINOR 144
-#define SGI_MMTIMER        153
+#define NVRAM_MINOR             144
+#define SGI_MMTIMER             153
 #define STORE_QUEUE_MINOR       155
-#define I2O_MINOR 166
+#define I2O_MINOR               166
 #define MICROCODE_MINOR         184
-#define MWAVE_MINOR     219             /* ACP/Mwave Modem */
-#define MPT_MINOR       220
-#define MISC_DYNAMIC_MINOR 255
-
-#define TUN_MINOR            200
-#define HPET_MINOR           228
-#define KVM_MINOR            232
+#define TUN_MINOR               200
+#define MWAVE_MINOR             219     /* ACP/Mwave Modem */
+#define MPT_MINOR               220
+#define HPET_MINOR              228
+#define FUSE_MINOR              229
+#define KVM_MINOR               232
+#define MISC_DYNAMIC_MINOR      255
 
 struct device;