fix

2 files changed, 13 insertions, 4 deletions

diff --git a/include/fuse.h b/include/fuse.h
index b85f0d8..c2f0be4 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -86,7 +86,9 @@ typedef int (*fuse_dirfil_t) (fuse_dirh_t h, const char *name, int type);
  * 
  *  - read(), write() are not passed a filehandle, but rather a
  *  pathname.  The offset of the read and write is passed as the last
- *  argument, like the pread() and pwrite() system calls.
+ *  argument, like the pread() and pwrite() system calls.  (NOTE:
+ *  read() should always return the number of bytes requested, except
+ *  at end of file)
  * 
  *  - release() is called when an open file has:
  *       1) all file descriptors closed
@@ -142,10 +144,11 @@ extern "C" {
  * main() function.
  * 
  * This function does the following:
- *   - mounts the filesystem
+ *   - parses command line options (-d -s and -h)
+ *   - passes all options after '--' to the fusermount program
+ *   - mounts the filesystem by calling fusermount
  *   - installs signal handlers for INT, HUP, TERM and PIPE
  *   - registers an exit handler to unmount the filesystem on program exit
- *   - parses command line options (-d -s and -h)
  *   - creates a fuse handle
  *   - registers the operations
  *   - calls either the single-threaded or the multi-threaded event loop
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index bcd85b0..909c8b0 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -12,7 +12,7 @@
 #define FUSE_KERNEL_VERSION 2
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 1
+#define FUSE_KERNEL_MINOR_VERSION 2
 
 /** The inode number of the root indode */
 #define FUSE_ROOT_INO 1
@@ -53,6 +53,12 @@ permission checking is done in the kernel */
     until the INVALIDATE operation is invoked */
 #define FUSE_KERNEL_CACHE        (1 << 2)
 
+/** Allow FUSE to combine reads into 64k chunks.  This is useful if
+    the filesystem is better at handling large chunks.  NOTE: in
+    current implementation the raw throughput is worse for large reads
+    than for small. */
+#define FUSE_LARGE_READ          (1 << 3)
+
 struct fuse_attr {
 	unsigned int        mode;
 	unsigned int        nlink;