---

yaml
---
r: 163693
b: refs/heads/master
c: 1358870
h: refs/heads/master
i:
  163691: 671eb2d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a80e9867db154966b2a771042e10452ac110e1e
+refs/heads/master: 1358870deaf11a752a84fbd89201749aa62498e8

trunk/Documentation/filesystems/ext4.txt

@@ -257,10 +257,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		(*)	ext4 associates buffer heads to data pages to
 nobh			(a) cache disk block mapping information