summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-13 10:05:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-13 10:05:36 -0700
commit54753fdb943ecd28a0666ee4ef105224407a5044 (patch)
tree1868ec529591703afb7e78a7cae5011db643dac2 /Documentation
parent1e103d198eb1effb43173412514ac3385ea6765f (diff)
parent6dbce5218298c0c77a740b3ffe97cb8c304e1710 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: ext3: Update documentation about ext3 quota mount options ext3: Don't update superblock write time when filesystem is read-only
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/ext3.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 570f9bd9be2..05d5cf1d743 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -123,10 +123,18 @@ resuid=n The user ID which may use the reserved blocks.
sb=n Use alternate superblock at this location.
-quota
-noquota
-grpquota
-usrquota
+quota These options are ignored by the filesystem. They
+noquota are used only by quota tools to recognize volumes
+grpquota where quota should be turned on. See documentation
+usrquota in the quota-tools package for more details
+ (http://sourceforge.net/projects/linuxquota).
+
+jqfmt=<quota type> These options tell filesystem details about quota
+usrjquota=<file> so that quota information can be properly updated
+grpjquota=<file> during journal replay. They replace the above
+ quota options. See documentation in the quota-tools
+ package for more details
+ (http://sourceforge.net/projects/linuxquota).
bh (*) ext3 associates buffer heads to data pages to
nobh (a) cache disk block mapping information