[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6] / include / linux / fuse.h

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index e7a76ec0f05cd961a550ab8e37b3095a629f868d..9fc48a674b82dc31c78aeb438b88862a9d28fbab 100644 (file)
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -125,7 +125,8 @@ enum fuse_opcode {
        FUSE_SETLK         = 32,
        FUSE_SETLKW        = 33,
        FUSE_ACCESS        = 34,
-       FUSE_CREATE        = 35
+       FUSE_CREATE        = 35,
+       FUSE_INTERRUPT     = 36,
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
@@ -291,6 +292,10 @@ struct fuse_init_out {
        __u32   max_write;
 };
 
+struct fuse_interrupt_in {
+       __u64   unique;
+};
+
 struct fuse_in_header {
        __u32   len;
        __u32   opcode;