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 b63bd2d7fcd3017bc8d63206da7e7978d143bce9..c318a8bbb1ef1efdbd68930ed687595f3c397121 100644 (file)
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -72,3 +72,7 @@ commit=nrsec  (*)     Ocfs2 can be told to sync all its data and metadata
                        it at the default (5 seconds).
                        Setting it to very large values will improve
                        performance.
                        it at the default (5 seconds).
                        Setting it to very large values will improve
                        performance.

+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.