sdio: add SDIO_FBR_BASE(f) macro

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

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 8e4319614bef1e25d7aaaaefdabc0ac5c80f173b..9fbe9d258e2259b196fc752213dd84ea03a2f5d4 100644 (file)
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -1,6 +1,6 @@
 /*
     FUSE: Filesystem in Userspace
 /*
     FUSE: Filesystem in Userspace

-    Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+    Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>

 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.


@@ -15,7 +15,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */

-#define FUSE_KERNEL_MINOR_VERSION 6
+#define FUSE_KERNEL_MINOR_VERSION 8

 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1


@@ -59,6 +59,13 @@ struct fuse_kstatfs {
        __u32   spare[6];
 };
 
        __u32   spare[6];
 };
 

+struct fuse_file_lock {
+       __u64   start;
+       __u64   end;
+       __u32   type;
+       __u32   pid; /* tgid */
+};
+

 /**
  * Bitmasks for fuse_setattr_in.valid
  */
 /**
  * Bitmasks for fuse_setattr_in.valid
  */


@@ -83,6 +90,12 @@ struct fuse_kstatfs {
  * INIT request/reply flags
  */
 #define FUSE_ASYNC_READ                (1 << 0)
  * INIT request/reply flags
  */
 #define FUSE_ASYNC_READ                (1 << 0)

+#define FUSE_POSIX_LOCKS       (1 << 1)
+
+/**
+ * Release flags
+ */
+#define FUSE_RELEASE_FLUSH     (1 << 0)

 
 enum fuse_opcode {
        FUSE_LOOKUP        = 1,
 
 enum fuse_opcode {
        FUSE_LOOKUP        = 1,


@@ -113,8 +126,14 @@ enum fuse_opcode {
        FUSE_READDIR       = 28,
        FUSE_RELEASEDIR    = 29,
        FUSE_FSYNCDIR      = 30,
        FUSE_READDIR       = 28,
        FUSE_RELEASEDIR    = 29,
        FUSE_FSYNCDIR      = 30,

+       FUSE_GETLK         = 31,
+       FUSE_SETLK         = 32,
+       FUSE_SETLKW        = 33,

        FUSE_ACCESS        = 34,
        FUSE_ACCESS        = 34,

-       FUSE_CREATE        = 35
+       FUSE_CREATE        = 35,
+       FUSE_INTERRUPT     = 36,
+       FUSE_BMAP          = 37,
+       FUSE_DESTROY       = 38,

 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */


@@ -193,13 +212,15 @@ struct fuse_open_out {
 struct fuse_release_in {
        __u64   fh;
        __u32   flags;
 struct fuse_release_in {
        __u64   fh;
        __u32   flags;

-       __u32   padding;
+       __u32   release_flags;
+       __u64   lock_owner;

 };
 
 struct fuse_flush_in {
        __u64   fh;
 };
 
 struct fuse_flush_in {
        __u64   fh;

-       __u32   flush_flags;
+       __u32   unused;

        __u32   padding;
        __u32   padding;

+       __u64   lock_owner;

 };
 
 struct fuse_read_in {
 };
 
 struct fuse_read_in {


@@ -248,6 +269,16 @@ struct fuse_getxattr_out {
        __u32   padding;
 };
 
        __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;
 struct fuse_access_in {
        __u32   mask;
        __u32   padding;


@@ -269,6 +300,20 @@ struct fuse_init_out {
        __u32   max_write;
 };
 
        __u32   max_write;
 };
 

+struct fuse_interrupt_in {
+       __u64   unique;
+};
+
+struct fuse_bmap_in {
+       __u64   block;
+       __u32   blocksize;
+       __u32   padding;
+};
+
+struct fuse_bmap_out {
+       __u64   block;
+};
+

 struct fuse_in_header {
        __u32   len;
        __u32   opcode;
 struct fuse_in_header {
        __u32   len;
        __u32   opcode;


@@ -294,7 +339,7 @@ struct fuse_dirent {
        char name[0];
 };
 
        char name[0];
 };
 

-#define FUSE_NAME_OFFSET ((unsigned) ((struct fuse_dirent *) 0)->name)
+#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)

 #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
 #define FUSE_DIRENT_SIZE(d) \
        FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
 #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
 #define FUSE_DIRENT_SIZE(d) \
        FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)