[PATCH 015/106] ext4: don't show usrquota/grpquota twice in /proc/mounts

From: Luis Henriques
Date: Tue Jul 30 2013 - 05:59:51 EST -stable review patch. If anyone has any objections, please let me know.


From: Theodore Ts'o <tytso@xxxxxxx>

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@xxxxxxx>
Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
fs/ext4/super.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 89abdd7..0689c5d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1749,12 +1749,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");


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/