This is a note to let you know that I've just added the patch titled
ext4: don't show usrquota/grpquota twice in /proc/mounts
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-don-t-show-usrquota-grpquota-twice-in-proc-mounts.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ad065dd01662ae22138899e6b1c8eeb3a529964f Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <[email protected]>
Date: Thu, 11 Jul 2013 18:54:37 -0400
Subject: ext4: don't show usrquota/grpquota twice in /proc/mounts
From: Theodore Ts'o <[email protected]>
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" <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
fs/ext4/super.c | 6 ------
1 file changed, 6 deletions(-)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1684,12 +1684,6 @@ static inline void ext4_show_quota_optio
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
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/ext4-fix-corruption-when-online-resizing-a-fs-with-1k-block-size.patch
queue-3.10/ext4-fix-ext4_get_group_number.patch
queue-3.10/jbd2-fix-theoretical-race-in-jbd2__journal_restart.patch
queue-3.10/ext4-don-t-allow-ext4_free_blocks-to-fail-due-to-enomem.patch
queue-3.10/ext4-fix-data-offset-overflow-in-ext4_xattr_fiemap-on-32-bit-archs.patch
queue-3.10/ext4-fix-overflow-when-counting-used-blocks-on-32-bit-architectures.patch
queue-3.10/ext3-ext4-don-t-mess-with-dir_file-f_pos-in-htree_dirblock_to_tree.patch
queue-3.10/ext4-check-error-return-from-ext4_write_inline_data_end.patch
queue-3.10/ext4-fix-overflows-in-seek_hole-seek_data-implementations.patch
queue-3.10/ext4-fix-data-offset-overflow-on-32-bit-archs-in-ext4_inline_data_fiemap.patch
queue-3.10/jbd2-move-superblock-checksum-calculation-to-jbd2_write_superblock.patch
queue-3.10/ext4-don-t-show-usrquota-grpquota-twice-in-proc-mounts.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
