[ 3.5.y.z extended stable ] Patch "ext4: don't show usrquota/grpquota twice in /proc/mounts" has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Wed Jul 24 09:11:44 UTC 2013
This is a note to let you know that I have just added a patch titled
ext4: don't show usrquota/grpquota twice in /proc/mounts
to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 8a8bad9094a0a7de5b5d8350e69b5215924f0aad Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso at mit.edu>
Date: Thu, 11 Jul 2013 18:54:37 -0400
Subject: [PATCH] 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 at mit.edu>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
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");
#endif
}
--
1.8.1.2
More information about the kernel-team
mailing list