Commit ad065dd0 authored Jul 11, 2013 by Theodore Ts'o

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



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

parent 822dbba3

fs/ext4/super.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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
		}

Admin message