doc fixes

diff --git a/.cvsignore b/.cvsignore
index 8c9db8e5e98d3e936e925d98c72bceb5662494b3..88cec53706003ac7a42d2a710a7a47c1e1315523 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,6 +9,7 @@ missing
 *.cache
 config.*
 depcomp
+compile
 libtool
 INSTALL
 fuse.pc

diff --git a/ChangeLog b/ChangeLog
index bdd4c5fd5a3caa676d4e927bee2c27698f63a721..053fd0a70763b2edd3b0cd925eff7b08c2876728 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@
        * ulockmgr: handle the case, when a locking operation fails
        because no more file desctriptors are available in
        ulockmgr_server.  Also work around a Linux kernel bug (known to
-       exist for all Linux kernel versions <= 2.6.19) which may cause
+       exist for all Linux kernel versions <= 2.6.18) which may cause
        sent file descriptors to be lost in the above case
 
        * ulockmgr: optimize file descriptor use

diff --git a/include/fuse.h b/include/fuse.h
index 37aec282af6b6899a2990d18d95738b9c3be7f64..6af2c4fdb1bc7077ee6255a2e491b1cfd97b9030 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -300,6 +300,7 @@ struct fuse_operations {
      * destroy() method.
      *
      * Introduced in version 2.3
+     * Changed in version 2.6
      */
     void *(*init) (struct fuse_conn_info *conn);
 

diff --git a/include/fuse_common.h b/include/fuse_common.h
index b687043e5ff38f285903b479dcfe776b72217654..8dc7bc25ae2d12a576f3fb8767390ec874e3eeb2 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -74,12 +74,42 @@ struct fuse_file_info {
     uint64_t lock_owner;
 };
 
+/**
+ * Connection information, passed to the ->init() method
+ *
+ * Some of the elements are read-write, these can be changed to
+ * indicate the value requested by the filesystem.  The requested
+ * value must usually be smaller than the indicated value.
+ */
 struct fuse_conn_info {
+    /**
+     * Major version of the protocol (read-only)
+     */
     unsigned proto_major;
+
+    /**
+     * Minor version of the protocol (read-only)
+     */
     unsigned proto_minor;
+
+    /**
+     * Is asynchronous read supported (read-write)
+     */
     unsigned async_read;
+
+    /**
+     * Maximum size of the write buffer
+     */
     unsigned max_write;
+
+    /**
+     * Maximum readahead
+     */
     unsigned max_readahead;
+
+    /**
+     * For future use.
+     */
     unsigned reserved[27];
 };