ext4: don't show usrquota/grpquota twice in /proc/mounts
authorTheodore Ts'o <tytso@mit.edu>
Thu, 11 Jul 2013 22:54:37 +0000 (18:54 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 11 Jul 2013 22:54:37 +0000 (18:54 -0400)
We now print mount options in a generic fashion in
ext4_show_options(), so we shouldn't be explicitly printing the
{usr,grp}quota options in ext4_show_quota_options().

Without this patch, /proc/mounts can look like this:

 /dev/vdb /vdb ext4 rw,relatime,quota,usrquota,data=ordered,usrquota 0 0
                                      ^^^^^^^^              ^^^^^^^^

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
fs/ext4/super.c

index 8862d4ddf71f78f96525f876349a596612d5011d..bca26f34edf4ca55dadc3ac9c5447d916dcbe4fa 100644 (file)
@@ -1702,12 +1702,6 @@ static inline void ext4_show_quota_options(struct seq_file *seq,
 
        if (sbi->s_qf_names[GRPQUOTA])
                seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]);
-
-       if (test_opt(sb, USRQUOTA))
-               seq_puts(seq, ",usrquota");
-
-       if (test_opt(sb, GRPQUOTA))
-               seq_puts(seq, ",grpquota");
 #endif
 }