From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 11 Jul 2013 22:54:37 +0000 (-0400)
Subject: ext4: don't show usrquota/grpquota twice in /proc/mounts
X-Git-Tag: firefly_0821_release~6453^2~1533
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbb1d9216c9d8f5ac0aca90719512deae7f989ea;p=firefly-linux-kernel-4.4.55.git

ext4: don't show usrquota/grpquota twice in /proc/mounts

commit ad065dd01662ae22138899e6b1c8eeb3a529964f upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 9751333d8030..6681c037b99d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1684,12 +1684,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
 }