Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[pandora-kernel.git] / Documentation / filesystems / nilfs2.txt

diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index d3e7673..d5c0cef 100644 (file)
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -49,7 +49,10 @@ Mount options
 NILFS2 supports the following mount options:
 (*) == default
 
-nobarrier              Disables barriers.
+barrier(*)             This enables/disables the use of write barriers.  This
+nobarrier              requires an IO stack which can support barriers, and
+                       if nilfs gets an error on a barrier write, it will
+                       disable again with a warning.
 errors=continue                Keep going on a filesystem error.
 errors=remount-ro(*)   Remount the filesystem read-only on an error.
 errors=panic           Panic and halt the machine if an error occurs.
@@ -74,9 +77,10 @@ norecovery           Disable recovery of the filesystem on mount.
                        This disables every write access on the device for
                        read-only mounts or snapshots.  This option will fail
                        for r/w mounts on an unclean volume.
-discard                        Issue discard/TRIM commands to the underlying block
-                       device when blocks are freed.  This is useful for SSD
-                       devices and sparse/thinly-provisioned LUNs.
+discard                        This enables/disables the use of discard/TRIM commands.
+nodiscard(*)           The discard/TRIM commands are sent to the underlying
+                       block device when blocks are freed.  This is useful
+                       for SSD devices and sparse/thinly-provisioned LUNs.
 
 NILFS2 usage
 ============