Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / Documentation / filesystems / ext3.txt

diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index f4d0de6..4aecc9b 100644 (file)
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -84,8 +84,6 @@ reservation
 
 noreservation
 
-resize=
-
 bsddf          (*)     Make 'df' act like BSD.
 minixdf                        Make 'df' act like Minix.
 
@@ -115,6 +113,14 @@ noquota
 grpquota
 usrquota
 
+bh             (*)     ext3 associates buffer heads to data pages to
+nobh                   (a) cache disk block mapping information
+                       (b) link pages into transaction to provide
+                           ordering guarantees.
+                       "bh" option forces use of buffer heads.
+                       "nobh" option tries to avoid associating buffer
+                       heads (supported only for "writeback" mode).
+
 
 Specification
 =============
@@ -175,6 +181,7 @@ See manual pages to learn more.
 tune2fs:       create a ext3 journal on a ext2 partition with the -j flag.
 mke2fs:        create a ext3 partition with the -j flag.
 debugfs:       ext2 and ext3 file system debugger.
+ext2online:    online (mounted) ext2 and ext3 filesystem resizer
 
 
 References
@@ -184,6 +191,7 @@ kernel source:      <file:fs/ext3/>
                <file:fs/jbd/>
 
 programs:      http://e2fsprogs.sourceforge.net/
+               http://ext2resize.sourceforge.net
 
 useful links:  http://www.zip.com.au/~akpm/linux/ext3/ext3-usage.html
                http://www-106.ibm.com/developerworks/linux/library/l-fs7/