Added documentation for FUSE_CAP_FLOCK_LOCKS

Fixes #106.

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 7f38ee142e30d59d066ef676f66329ede8894576..ed482055bb863d79aec762730fdd8a3db292ba3b 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -5,6 +5,8 @@ UNRELEASED CHANGES
 
 * Made check for util-linux version more robust.
 
+* Added documentation for FUSE_CAP_FLOCK_LOCKS.
+
 FUSE 3.0.0-rc2 (2016-11-06)
 ===========================
 

diff --git a/include/fuse_common.h b/include/fuse_common.h
index 2ba388857498560cbbba2211a20590bc54f3a590..d7adab0946ecadec4b5c213f420e3e821ad5ef8f 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -134,8 +134,12 @@ struct fuse_file_info {
 #define FUSE_CAP_SPLICE_READ           (1 << 9)
 
 /**
- * FIXME: This capability is not documented. Please get in touch if
- * you know what it does!
+ * If set, the calls to flock(2) will be emulated using POSIX locks and must
+ * then be handled by the filesystem's setlock() handler.
+ *
+ * If not set, flock(2) calls will be handled by the FUSE kernel module
+ * internally (so any access that does not go through the kernel cannot be taken
+ * into account).
  */
 #define FUSE_CAP_FLOCK_LOCKS           (1 << 10)