From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: Re: [PATCH] ext4: don't show usrquota/grpquota twice in /proc/mounts Date: Tue, 16 Jul 2013 17:18:01 +0200 Message-ID: <20130716151801.GD25632@quack.suse.cz> References: <1373583305-29126-1-git-send-email-tytso@mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ext4 Developers List , stable@vger.kernel.org To: Theodore Ts'o Return-path: Content-Disposition: inline In-Reply-To: <1373583305-29126-1-git-send-email-tytso@mit.edu> Sender: stable-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org On Thu 11-07-13 18:55:05, Ted Tso wrote: > 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" > Cc: stable@vger.kernel.org Looks good. You can add: Reviewed-by: Jan Kara Honza > --- > fs/ext4/super.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 8862d4d..bca26f3 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 > } > > -- > 1.7.12.rc0.22.gcdd159b > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Jan Kara SUSE Labs, CR