Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / Documentation / filesystems / ext4.txt

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 6a4adcae9f9a699d624a0bb114f8e0d5f86161c5..560f88dc7090dadcfd7c2db4fc6821c64b8da3fe 100644 (file)
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -86,9 +86,21 @@ Alex is working on a new set of patches right now.
 When mounting an ext4 filesystem, the following option are accepted:
 (*) == default
 
 When mounting an ext4 filesystem, the following option are accepted:
 (*) == default
 

-extents                        ext4 will use extents to address file data.  The
+extents                (*)     ext4 will use extents to address file data.  The

                        file system will no longer be mountable by ext3.
 
                        file system will no longer be mountable by ext3.
 

+noextents              ext4 will not use extents for newly created files
+
+journal_checksum       Enable checksumming of the journal transactions.
+                       This will allow the recovery code in e2fsck and the
+                       kernel to detect corruption in the kernel.  It is a
+                       compatible change and will be ignored by older kernels.
+
+journal_async_commit   Commit block can be written to disk without waiting
+                       for descriptor blocks. If enabled older kernels cannot
+                       mount the device. This will enable 'journal_checksum'
+                       internally.
+

 journal=update         Update the ext4 file system's journal to the current
                        format.
 
 journal=update         Update the ext4 file system's journal to the current
                        format.
 


@@ -196,6 +208,12 @@ nobh                       (a) cache disk block mapping information
                        "nobh" option tries to avoid associating buffer
                        heads (supported only for "writeback" mode).
 
                        "nobh" option tries to avoid associating buffer
                        heads (supported only for "writeback" mode).
 

+mballoc                (*)     Use the multiple block allocator for block allocation
+nomballoc              disabled multiple block allocator for block allocation.
+stripe=n               Number of filesystem blocks that mballoc will try
+                       to use for allocation size and alignment. For RAID5/6
+                       systems this should be the number of data
+                       disks *  RAID chunk size in file system blocks.

 
 Data Mode
 ---------
 
 Data Mode
 ---------