summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-07-12 02:54:37 +0400
committerTheodore Ts'o <tytso@mit.edu>2013-07-12 02:54:37 +0400
commitad065dd01662ae22138899e6b1c8eeb3a529964f (patch)
tree6ca6c1d17c27b7f06d99526e481ba089c7ebab5c /fs
parent822dbba33458cd6ad0e715f3f4a57ebc99d54d1b (diff)
downloadlinux-ad065dd01662ae22138899e6b1c8eeb3a529964f.tar.xz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8862d4ddf71f..bca26f34edf4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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
}