Merge branch 'master' of /home/cbou/linux-2.6

[linux-2.6] / Documentation / filesystems / ocfs2.txt

diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt
index 071fad137eb553b5ba2dd158c615ce185cccd294..c318a8bbb1ef1efdbd68930ed687595f3c397121 100644 (file)
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -75,3 +75,4 @@ commit=nrsec  (*)     Ocfs2 can be told to sync all its data and metadata
 localalloc=8(*)                Allows custom localalloc size in MB. If the value is too
                        large, the fs will silently revert it to the default.
                        Localalloc is not enabled for local mounts.
+localflocks            This disables cluster aware flock.