2018-07-25 23:43:25

by Chao Yu

Subject: [PATCH RESEND] f2fs: fix to restrict mount condition when without CONFIG_QUOTA

From: Chao Yu <[email protected]>

Like quota_ino feature, we need to reject mounting RDWR with image
which enables project_quota feature when there is no CONFIG_QUOTA
be set in kernel.

Signed-off-by: Chao Yu <[email protected]>
---
fs/f2fs/super.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index dbc1cb53581f..bc7c14a055bb 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -775,6 +775,12 @@ static int parse_options(struct super_block *sb, char *options)
"without CONFIG_QUOTA");
return -EINVAL;
}
+ if (f2fs_sb_has_project_quota(sbi->sb) && !f2fs_readonly(sbi->sb)) {
+ f2fs_msg(sb, KERN_ERR,
+ "Filesystem with project quota feature cannot be "
+ "mounted RDWR without CONFIG_QUOTA");
+ return -EINVAL;
+ }
#endif

if (F2FS_IO_SIZE_BITS(sbi) && !test_opt(sbi, LFS)) {
--
2.16.2.17.g38e79b1fd

2018-07-26 01:43:57

by Sheng Yong

Subject: Re: [f2fs-dev] [PATCH RESEND] f2fs: fix to restrict mount condition when without CONFIG_QUOTA

Hi, Chao

On 2018/7/26 7:19, Chao Yu wrote:
> From: Chao Yu <[email protected]>
>
> Like quota_ino feature, we need to reject mounting RDWR with image
> which enables project_quota feature when there is no CONFIG_QUOTA
> be set in kernel.
>
> Signed-off-by: Chao Yu <[email protected]>
> ---
> fs/f2fs/super.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index dbc1cb53581f..bc7c14a055bb 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -775,6 +775,12 @@ static int parse_options(struct super_block *sb, char *options)
> "without CONFIG_QUOTA");
> return -EINVAL;
> }

I think the following should be checked within !CONFIG_QUOTA, like patch "f2fs: quota: do
not mount as RDWR without QUOTA if quota feature enabled" :)

thanks

> + if (f2fs_sb_has_project_quota(sbi->sb) && !f2fs_readonly(sbi->sb)) {
> + f2fs_msg(sb, KERN_ERR,
> + "Filesystem with project quota feature cannot be "
> + "mounted RDWR without CONFIG_QUOTA");
> + return -EINVAL;
> + }
> #endif
>
> if (F2FS_IO_SIZE_BITS(sbi) && !test_opt(sbi, LFS)) {
>

2018-07-26 01:54:37

by Chao Yu

Subject: Re: [f2fs-dev] [PATCH RESEND] f2fs: fix to restrict mount condition when without CONFIG_QUOTA

On 2018/7/26 9:41, Sheng Yong wrote:
> Hi, Chao
>
> On 2018/7/26 7:19, Chao Yu wrote:
>> From: Chao Yu <[email protected]>
>>
>> Like quota_ino feature, we need to reject mounting RDWR with image
>> which enables project_quota feature when there is no CONFIG_QUOTA
>> be set in kernel.
>>
>> Signed-off-by: Chao Yu <[email protected]>
>> ---
>> fs/f2fs/super.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index dbc1cb53581f..bc7c14a055bb 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -775,6 +775,12 @@ static int parse_options(struct super_block *sb, char *options)
>> "without CONFIG_QUOTA");
>> return -EINVAL;
>> }
>
> I think the following should be checked within !CONFIG_QUOTA, like patch "f2fs: quota: do
> not mount as RDWR without QUOTA if quota feature enabled" :)

I wrote this patch based on yours, so I think the code actually locates in the
right place. Please check serials on below link:

https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/log/?h=f2fs-dev

>
> thanks
>
>> + if (f2fs_sb_has_project_quota(sbi->sb) && !f2fs_readonly(sbi->sb)) {
>> + f2fs_msg(sb, KERN_ERR,
>> + "Filesystem with project quota feature cannot be "
>> + "mounted RDWR without CONFIG_QUOTA");
>> + return -EINVAL;
>> + }
>> #endif
>>
>> if (F2FS_IO_SIZE_BITS(sbi) && !test_opt(sbi, LFS)) {
>>
>
>
> .
>