Patchwork ext4: don't show usrquota/grpquota twice in /proc/mounts

login
register
mail settings
Submitter Theodore Ts'o
Date July 11, 2013, 10:55 p.m.
Message ID <1373583305-29126-1-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/258638/
State Accepted
Headers show

Comments

Theodore Ts'o - July 11, 2013, 10:55 p.m.
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
---
 fs/ext4/super.c | 6 ------
 1 file changed, 6 deletions(-)
Jan Kara - July 16, 2013, 3:18 p.m.
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" <tytso@mit.edu>
> Cc: stable@vger.kernel.org
  Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>

								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

Patch

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
 }