[PATCH 1/2] f2fs: remove QUOTA flag setting in f2fs_set_qf_name()

[PATCH 1/2] f2fs: remove QUOTA flag setting in f2fs_set_qf_name()

[Chengguang Xu]

Mount flag QUOTA is the same as flag USRQUOTA in f2fs, so should not
set flag QUOTA in f2fs_set_qf_name().

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
 fs/f2fs/super.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 896b885f504e..e2abd45c2cdd 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -286,7 +286,6 @@ static int f2fs_set_qf_name(struct super_block *sb, int qtype,
 		goto errout;
 	}
 	F2FS_OPTION(sbi).s_qf_names[qtype] = qname;
-	set_opt(sbi, QUOTA);
 	return 0;
 errout:
 	kfree(qname);
-- 
2.17.1

[PATCH 2/2] f2fs: remove unnecessary mount optino flag 'QUOTA'

[Chengguang Xu]

Code cleanup by removing unnecessary mount option
flag 'QUOTA'.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
 fs/f2fs/f2fs.h  | 1 -
 fs/f2fs/super.c | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index abf925664d9c..58d3e40ee46c 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -97,7 +97,6 @@ extern char *f2fs_fault_name[FAULT_MAX];
 #define F2FS_MOUNT_USRQUOTA		0x00080000
 #define F2FS_MOUNT_GRPQUOTA		0x00100000
 #define F2FS_MOUNT_PRJQUOTA		0x00200000
-#define F2FS_MOUNT_QUOTA		0x00400000
 #define F2FS_MOUNT_INLINE_XATTR_SIZE	0x00800000
 #define F2FS_MOUNT_RESERVE_ROOT		0x01000000
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index e2abd45c2cdd..74eb63e8a2fd 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -680,7 +680,6 @@ static int parse_options(struct super_block *sb, char *options)
 			F2FS_OPTION(sbi).s_jquota_fmt = QFMT_VFS_V1;
 			break;
 		case Opt_noquota:
-			clear_opt(sbi, QUOTA);
 			clear_opt(sbi, USRQUOTA);
 			clear_opt(sbi, GRPQUOTA);
 			clear_opt(sbi, PRJQUOTA);
@@ -1345,8 +1344,6 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
 	}
 #endif
 #ifdef CONFIG_QUOTA
-	if (test_opt(sbi, QUOTA))
-		seq_puts(seq, ",quota");
 	if (test_opt(sbi, USRQUOTA))
 		seq_puts(seq, ",usrquota");
 	if (test_opt(sbi, GRPQUOTA))
-- 
2.17.1

Re: [PATCH 1/2] f2fs: remove QUOTA flag setting in f2fs_set_qf_name()

[Chao Yu]

On 2018/9/27 23:23, Chengguang Xu wrote:
> Mount flag QUOTA is the same as flag USRQUOTA in f2fs, so should not
> set flag QUOTA in f2fs_set_qf_name().

Those journalled quota codes were copied from ext4, I'm not sure, maybe
there are some userspace tools replying on this mount option, for example,
apps can check 'quota' mount option to know whether current filesystem
support quota feature, can you check that?

Thanks,

> 
> Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
> ---
>  fs/f2fs/super.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 896b885f504e..e2abd45c2cdd 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -286,7 +286,6 @@ static int f2fs_set_qf_name(struct super_block *sb, int qtype,
>  		goto errout;
>  	}
>  	F2FS_OPTION(sbi).s_qf_names[qtype] = qname;
> -	set_opt(sbi, QUOTA);
>  	return 0;
>  errout:
>  	kfree(qname);
>