diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2013-07-11 18:54:37 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 18:21:33 -0700 |
| commit | bbb1d9216c9d8f5ac0aca90719512deae7f989ea (patch) | |
| tree | 9bb36bae940a3bdfe8a3c019897fda80d8843c36 /fs/ext4 | |
| parent | d860925657644b00b0fed703c647edcf2aa27975 (diff) | |
| download | linux-3.10-bbb1d9216c9d8f5ac0aca90719512deae7f989ea.tar.gz linux-3.10-bbb1d9216c9d8f5ac0aca90719512deae7f989ea.tar.bz2 linux-3.10-bbb1d9216c9d8f5ac0aca90719512deae7f989ea.zip | |
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>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9751333d803..6681c037b99 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 } |