linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 9fc48a6..5425b60 100644 (file)
--- 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-2005  Miklos Szeredi <miklos@szeredi.hu>
 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
@@ -9,19 +9,18 @@
 /* This file defines the kernel interface of FUSE */
 
 #include <asm/types.h>
-#include <linux/major.h>
 
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 7
+#define FUSE_KERNEL_MINOR_VERSION 6
 
 /** 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
+#define FUSE_MAJOR 10
 
 /** The minor number of the fuse character device */
 #define FUSE_MINOR 229
@@ -59,13 +58,6 @@ struct fuse_kstatfs {
        __u32   spare[6];
 };
 
-struct fuse_file_lock {
-       __u64   start;
-       __u64   end;
-       __u32   type;
-       __u32   pid; /* tgid */
-};
-
 /**
  * Bitmasks for fuse_setattr_in.valid
  */
@@ -90,7 +82,6 @@ struct fuse_file_lock {
  * INIT request/reply flags
  */
 #define FUSE_ASYNC_READ                (1 << 0)
-#define FUSE_POSIX_LOCKS       (1 << 1)
 
 enum fuse_opcode {
        FUSE_LOOKUP        = 1,
@@ -121,12 +112,8 @@ enum fuse_opcode {
        FUSE_READDIR       = 28,
        FUSE_RELEASEDIR    = 29,
        FUSE_FSYNCDIR      = 30,
-       FUSE_GETLK         = 31,
-       FUSE_SETLK         = 32,
-       FUSE_SETLKW        = 33,
        FUSE_ACCESS        = 34,
-       FUSE_CREATE        = 35,
-       FUSE_INTERRUPT     = 36,
+       FUSE_CREATE        = 35
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
@@ -212,7 +199,6 @@ struct fuse_flush_in {
        __u64   fh;
        __u32   flush_flags;
        __u32   padding;
-       __u64   lock_owner;
 };
 
 struct fuse_read_in {
@@ -261,16 +247,6 @@ struct fuse_getxattr_out {
        __u32   padding;
 };
 
-struct fuse_lk_in {
-       __u64   fh;
-       __u64   owner;
-       struct fuse_file_lock lk;
-};
-
-struct fuse_lk_out {
-       struct fuse_file_lock lk;
-};
-
 struct fuse_access_in {
        __u32   mask;
        __u32   padding;
@@ -292,10 +268,6 @@ struct fuse_init_out {
        __u32   max_write;
 };
 
-struct fuse_interrupt_in {
-       __u64   unique;
-};
-
 struct fuse_in_header {
        __u32   len;
        __u32   opcode;