drm/i915: Fix SDVO TV support

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

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index a50d0d9..162e5de 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-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.
 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.


@@ -13,26 +13,34 @@
  *
  * 7.9:
  *  - new fuse_getattr_in input argument of GETATTR
  *
  * 7.9:
  *  - new fuse_getattr_in input argument of GETATTR

+ *  - add lk_flags in fuse_lk_in
+ *  - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in
+ *  - add blksize field to fuse_attr
+ *  - add file flags field to fuse_read_in and fuse_write_in
+ *
+ * 7.10
+ *  - add nonseekable open flag
+ *
+ * 7.11
+ *  - add IOCTL message
+ *  - add unsolicited notification support
+ *  - add POLL message and NOTIFY_POLL notification

  */
 
  */
 

-#include <asm/types.h>
-#include <linux/major.h>
+#ifndef _LINUX_FUSE_H
+#define _LINUX_FUSE_H
+
+#include <linux/types.h>

 
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
 
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */

-#define FUSE_KERNEL_MINOR_VERSION 9
+#define FUSE_KERNEL_MINOR_VERSION 11

 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
 
 
 /** 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 */
 
 /* Make sure all structures are padded to 64bit boundary, so 32bit
    userspace works under 64bit kernels */
 


@@ -51,6 +59,8 @@ struct fuse_attr {
        __u32   uid;
        __u32   gid;
        __u32   rdev;
        __u32   uid;
        __u32   gid;
        __u32   rdev;

+       __u32   blksize;
+       __u32   padding;

 };
 
 struct fuse_kstatfs {
 };
 
 struct fuse_kstatfs {


@@ -83,22 +93,32 @@ struct fuse_file_lock {
 #define FATTR_ATIME    (1 << 4)
 #define FATTR_MTIME    (1 << 5)
 #define FATTR_FH       (1 << 6)
 #define FATTR_ATIME    (1 << 4)
 #define FATTR_MTIME    (1 << 5)
 #define FATTR_FH       (1 << 6)

+#define FATTR_ATIME_NOW        (1 << 7)
+#define FATTR_MTIME_NOW        (1 << 8)
+#define FATTR_LOCKOWNER        (1 << 9)

 
 /**
  * Flags returned by the OPEN request
  *
  * FOPEN_DIRECT_IO: bypass page cache for this open file
  * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
 
 /**
  * Flags returned by the OPEN request
  *
  * FOPEN_DIRECT_IO: bypass page cache for this open file
  * FOPEN_KEEP_CACHE: don't invalidate the data cache on open

+ * FOPEN_NONSEEKABLE: the file is not seekable

  */
 #define FOPEN_DIRECT_IO                (1 << 0)
 #define FOPEN_KEEP_CACHE       (1 << 1)
  */
 #define FOPEN_DIRECT_IO                (1 << 0)
 #define FOPEN_KEEP_CACHE       (1 << 1)

+#define FOPEN_NONSEEKABLE      (1 << 2)

 
 /**
  * INIT request/reply flags
 
 /**
  * INIT request/reply flags

+ *
+ * FUSE_EXPORT_SUPPORT: filesystem handles lookups of "." and ".."

  */
 #define FUSE_ASYNC_READ                (1 << 0)
 #define FUSE_POSIX_LOCKS       (1 << 1)
 #define FUSE_FILE_OPS          (1 << 2)
  */
 #define FUSE_ASYNC_READ                (1 << 0)
 #define FUSE_POSIX_LOCKS       (1 << 1)
 #define FUSE_FILE_OPS          (1 << 2)

+#define FUSE_ATOMIC_O_TRUNC    (1 << 3)
+#define FUSE_EXPORT_SUPPORT    (1 << 4)
+#define FUSE_BIG_WRITES                (1 << 5)

 
 /**
  * Release flags
 
 /**
  * Release flags


@@ -110,6 +130,47 @@ struct fuse_file_lock {
  */
 #define FUSE_GETATTR_FH                (1 << 0)
 
  */
 #define FUSE_GETATTR_FH                (1 << 0)
 

+/**
+ * Lock flags
+ */
+#define FUSE_LK_FLOCK          (1 << 0)
+
+/**
+ * WRITE flags
+ *
+ * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
+ * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
+ */
+#define FUSE_WRITE_CACHE       (1 << 0)
+#define FUSE_WRITE_LOCKOWNER   (1 << 1)
+
+/**
+ * Read flags
+ */
+#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 */
 enum fuse_opcode {
        FUSE_LOOKUP        = 1,
        FUSE_FORGET        = 2,  /* no reply */


@@ -147,11 +208,20 @@ enum fuse_opcode {
        FUSE_INTERRUPT     = 36,
        FUSE_BMAP          = 37,
        FUSE_DESTROY       = 38,
        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 */
 #define FUSE_MIN_READ_BUFFER 8192
 
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
 #define FUSE_MIN_READ_BUFFER 8192
 

+#define FUSE_COMPAT_ENTRY_OUT_SIZE 120
+

 struct fuse_entry_out {
        __u64   nodeid;         /* Inode ID */
        __u64   generation;     /* Inode generation: nodeid:gen must
 struct fuse_entry_out {
        __u64   nodeid;         /* Inode ID */
        __u64   generation;     /* Inode generation: nodeid:gen must


@@ -173,6 +243,8 @@ struct fuse_getattr_in {
        __u64   fh;
 };
 
        __u64   fh;
 };
 

+#define FUSE_COMPAT_ATTR_OUT_SIZE 96
+

 struct fuse_attr_out {
        __u64   attr_valid;     /* Cache timeout for the attributes */
        __u32   attr_valid_nsec;
 struct fuse_attr_out {
        __u64   attr_valid;     /* Cache timeout for the attributes */
        __u32   attr_valid_nsec;


@@ -203,7 +275,7 @@ struct fuse_setattr_in {
        __u32   padding;
        __u64   fh;
        __u64   size;
        __u32   padding;
        __u64   fh;
        __u64   size;

-       __u64   unused1;
+       __u64   lock_owner;

        __u64   atime;
        __u64   mtime;
        __u64   unused2;
        __u64   atime;
        __u64   mtime;
        __u64   unused2;


@@ -246,14 +318,22 @@ struct fuse_read_in {
        __u64   fh;
        __u64   offset;
        __u32   size;
        __u64   fh;
        __u64   offset;
        __u32   size;

+       __u32   read_flags;
+       __u64   lock_owner;
+       __u32   flags;

        __u32   padding;
 };
 
        __u32   padding;
 };
 

+#define FUSE_COMPAT_WRITE_IN_SIZE 24
+

 struct fuse_write_in {
        __u64   fh;
        __u64   offset;
        __u32   size;
        __u32   write_flags;
 struct fuse_write_in {
        __u64   fh;
        __u64   offset;
        __u32   size;
        __u32   write_flags;

+       __u64   lock_owner;
+       __u32   flags;
+       __u32   padding;

 };
 
 struct fuse_write_out {
 };
 
 struct fuse_write_out {


@@ -292,6 +372,8 @@ struct fuse_lk_in {
        __u64   fh;
        __u64   owner;
        struct fuse_file_lock lk;
        __u64   fh;
        __u64   owner;
        struct fuse_file_lock lk;

+       __u32   lk_flags;
+       __u32   padding;

 };
 
 struct fuse_lk_out {
 };
 
 struct fuse_lk_out {


@@ -333,6 +415,38 @@ struct fuse_bmap_out {
        __u64   block;
 };
 
        __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;
 struct fuse_in_header {
        __u32   len;
        __u32   opcode;


@@ -362,3 +476,5 @@ struct fuse_dirent {
 #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)

+
+#endif /* _LINUX_FUSE_H */