Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / Documentation / filesystems / f2fs.txt

diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt
index 51afba17bbae89f433da7d150085df937c071c3c..a2046a7d0a9d6319c5be0c59d9ffea461ad9f53f 100644 (file)
--- a/Documentation/filesystems/f2fs.txt
+++ b/Documentation/filesystems/f2fs.txt
@@ -126,6 +126,11 @@ flush_merge               Merge concurrent cache_flush commands as much as possible
                        to eliminate redundant command issues. If the underlying
                       device handles the cache_flush command relatively slowly,
                       recommend to enable this option.
+nobarrier              This option can be used if underlying storage guarantees
+                       its cached data should be written to the novolatile area.
+                      If this option is set, no cache_flush commands are issued
+                      but f2fs still guarantees the write ordering of all the
+                      data writes.
 
 ================================================================================
 DEBUGFS ENTRIES