From: Nikolaus Rath <Nikolaus@rath.org>
Date: Thu, 10 Nov 2016 22:51:11 +0000 (-0800)
Subject: Added documentation for FUSE_CAP_FLOCK_LOCKS
X-Git-Tag: fuse-3.0.0rc3~30
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47426d453d8dcc2cdd2a7e812c9b5d25e9fc5028;p=qemu-gpiodev%2Flibfuse.git

Added documentation for FUSE_CAP_FLOCK_LOCKS

Fixes #106.
---

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 7f38ee1..ed48205 100644
--- 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 2ba3888..d7adab0 100644
--- 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)