This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Documentation / filesystems / ext2.txt

diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index b5cb911..23a4d98 100644 (file)
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -11,53 +11,57 @@ for NetBSD, FreeBSD, the GNU HURD, Windows 95/98/NT, OS/2 and RISC OS.
 Options
 =======
 
-Most defaults are determined by the filesystem superblock, and can be
-set using tune2fs(8). Kernel-determined defaults are indicated by (*).
+When mounting an ext2 filesystem, the following options are accepted.
+Defaults are marked with (*).
 
 bsddf                  (*)     Makes `df' act like BSD.
 minixdf                                Makes `df' act like Minix.
 
-check                          Check block and inode bitmaps at mount time
-                               (requires CONFIG_EXT2_CHECK).
+barrier=1                      This enables/disables barriers. barrier=0 disables it,
+                               barrier=1 enables it.
+
+orlov                  (*)     This enables the new Orlov block allocator. It's
+                               enabled by default.
+
+oldalloc                       This disables the Orlov block allocator and
+                               enables the old block allocator. Orlov should
+                               have better performance, we'd like to get some
+                               feedback  if it's the contrary for you.
+
+user_xattr             (*)     Enables POSIX Extended Attributes. It's enabled by
+                               default, however you need to confifure its support
+                               (CONFIG_EXT2_FS_XATTR). This is neccesary if you want
+                               to use POSIX Acces Control Lists support. You can visit
+                               http://acl.bestbits.at to know more about POSIX Extended
+                               attributes.
+
+nouser_xattr                   Disables POSIX Extended Attributes.
+
+acl                    (*)     Enables POSIX Access Control Lists support. This is
+                               enabled by default, however you need to configure
+                               its support (CONFIG_EXT2_FS_POSIX_ACL). If you want
+                               to know more about ACLs visit http://acl.bestbits.at
+
+noacl                          This option disables POSIX Access Control List support.
+
 check=none, nocheck    (*)     Don't do extra checking of bitmaps on mount
                                (check=normal and check=strict options removed)
 
 debug                          Extra debugging information is sent to the
                                kernel syslog.  Useful for developers.
 
-errors=continue                        Keep going on a filesystem error.
+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.
 
 grpid, bsdgroups               Give objects the same group ID as their parent.
-nogrpid, sysvgroups            New objects have the group ID of their creator.
-
-nouid32                                Use 16-bit UIDs and GIDs.
-
-oldalloc                       Enable the old block allocator. Orlov should
-                               have better performance, we'd like to get some
-                               feedback if it's the contrary for you.
-orlov                  (*)     Use the Orlov block allocator.
-                               (See http://lwn.net/Articles/14633/ and
-                               http://lwn.net/Articles/14446/.)
+nogrpid, sysvgroups    (*)     New objects have the group ID of their creator.
 
 resuid=n                       The user ID which may use the reserved blocks.
-resgid=n                       The group ID which may use the reserved blocks.
+resgid=n                       The group ID which may use the reserved blocks. 
 
 sb=n                           Use alternate superblock at this location.
 
-user_xattr                     Enable "user." POSIX Extended Attributes
-                               (requires CONFIG_EXT2_FS_XATTR).
-                               See also http://acl.bestbits.at
-nouser_xattr                   Don't support "user." extended attributes.
-
-acl                            Enable POSIX Access Control Lists support
-                               (requires CONFIG_EXT2_FS_POSIX_ACL).
-                               See also http://acl.bestbits.at
-noacl                          Don't support POSIX ACLs.
-
-nobh                           Do not attach buffer_heads to file pagecache.
-
 grpquota,noquota,quota,usrquota        Quota options are silently ignored by ext2.