Skip to content

Commit

Permalink
ext4: don't show usrquota/grpquota twice in /proc/mounts
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Theodore Ts'o committed Jul 11, 2013
1 parent 822dbba commit ad065dd
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit ad065dd

Please sign in to comment.