[PATCH 1/2] check: recognize f2fs through parameter

[PATCH 1/2] check: recognize f2fs through parameter

[Chao Yu]

Add a paramenter in check to configure $FSTYP for f2fs.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 check | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/check b/check
index f3c8021d94b9..a9024094721a 100755
--- a/check
+++ b/check
@@ -59,6 +59,7 @@ check options
     -pvfs2          test PVFS2
     -tmpfs              test TMPFS
     -ubifs              test ubifs
+    -f2fs		test f2fs
     -l			line mode diff
     -udiff		show unified diff (default)
     -n			show me, do not run tests
@@ -263,6 +264,7 @@ while [ $# -gt 0 ]; do
 	-pvfs2)		FSTYP=pvfs2 ;;
 	-tmpfs)		FSTYP=tmpfs ;;
 	-ubifs)		FSTYP=ubifs ;;
+	-f2fs)		FSTYP=f2fs ;;
 
 	-g)	group=$2 ; shift ;
 		GROUP_LIST="$GROUP_LIST ${group//,/ }"
-- 
2.18.0.rc1

[PATCH 1/2] check: recognize f2fs through parameter

[Chao Yu]

Add a paramenter in check to configure $FSTYP for f2fs.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 check | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/check b/check
index f3c8021d94b9..a9024094721a 100755
--- a/check
+++ b/check
@@ -59,6 +59,7 @@ check options
     -pvfs2          test PVFS2
     -tmpfs              test TMPFS
     -ubifs              test ubifs
+    -f2fs		test f2fs
     -l			line mode diff
     -udiff		show unified diff (default)
     -n			show me, do not run tests
@@ -263,6 +264,7 @@ while [ $# -gt 0 ]; do
 	-pvfs2)		FSTYP=pvfs2 ;;
 	-tmpfs)		FSTYP=tmpfs ;;
 	-ubifs)		FSTYP=ubifs ;;
+	-f2fs)		FSTYP=f2fs ;;
 
 	-g)	group=$2 ; shift ;
 		GROUP_LIST="$GROUP_LIST ${group//,/ }"
-- 
2.18.0.rc1

[PATCH 2/2] common/quota: adapt _require_prjquota() for f2fs

[Chao Yu]

In _require_prjquota(), let's check project quota support as below for
f2fs:
- For image support, check 'project_quota' on enabled feature list of
specified device.
- For kernel support, check /sys/fs/f2fs/features/project_quota sysfs
entry status.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 common/quota | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/quota b/common/quota
index 9ab091817804..9b8641350a4d 100644
--- a/common/quota
+++ b/common/quota
@@ -82,6 +82,13 @@ _require_prjquota()
 	dumpe2fs -h $_dev 2>&1 | grep -qw project || \
 		_notrun "Project quota not available on this $FSTYP"
     fi
+    if [ "$FSTYP" == "f2fs" ]; then
+	dump.f2fs $_dev 2>&1 | grep -qw project_quota
+	[ $? -ne 0 ] && _notrun "Project quota not enabled in this device $_dev"
+	cat /sys/fs/f2fs/features/project_quota | grep -qw supported
+	[ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
+	return
+    fi
     src/feature -P $_dev
     [ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
     if [ "$USE_EXTERNAL" = yes -a ! -z "$_dev" ]; then
-- 
2.18.0.rc1

[PATCH 2/2] common/quota: adapt _require_prjquota() for f2fs

[Chao Yu]

In _require_prjquota(), let's check project quota support as below for
f2fs:
- For image support, check 'project_quota' on enabled feature list of
specified device.
- For kernel support, check /sys/fs/f2fs/features/project_quota sysfs
entry status.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 common/quota | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/quota b/common/quota
index 9ab091817804..9b8641350a4d 100644
--- a/common/quota
+++ b/common/quota
@@ -82,6 +82,13 @@ _require_prjquota()
 	dumpe2fs -h $_dev 2>&1 | grep -qw project || \
 		_notrun "Project quota not available on this $FSTYP"
     fi
+    if [ "$FSTYP" == "f2fs" ]; then
+	dump.f2fs $_dev 2>&1 | grep -qw project_quota
+	[ $? -ne 0 ] && _notrun "Project quota not enabled in this device $_dev"
+	cat /sys/fs/f2fs/features/project_quota | grep -qw supported
+	[ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
+	return
+    fi
     src/feature -P $_dev
     [ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
     if [ "$USE_EXTERNAL" = yes -a ! -z "$_dev" ]; then
-- 
2.18.0.rc1

Re: [PATCH 1/2] check: recognize f2fs through parameter

[Eryu Guan]

On Sun, Sep 30, 2018 at 05:26:52PM +0800, Chao Yu wrote:
> Add a paramenter in check to configure $FSTYP for f2fs.
> 
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
>  check | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/check b/check
> index f3c8021d94b9..a9024094721a 100755
> --- a/check
> +++ b/check
> @@ -59,6 +59,7 @@ check options
>      -pvfs2          test PVFS2
>      -tmpfs              test TMPFS
>      -ubifs              test ubifs
> +    -f2fs		test f2fs
>      -l			line mode diff
>      -udiff		show unified diff (default)
>      -n			show me, do not run tests
> @@ -263,6 +264,7 @@ while [ $# -gt 0 ]; do
>  	-pvfs2)		FSTYP=pvfs2 ;;
>  	-tmpfs)		FSTYP=tmpfs ;;
>  	-ubifs)		FSTYP=ubifs ;;
> +	-f2fs)		FSTYP=f2fs ;;

The test harness should be able to detect the f2fs type from $TEST_DEV.
We add param to set FSTYP only when there's no way to tell the
filesystem type from the device.

Thanks,
Eryu

>  
>  	-g)	group=$2 ; shift ;
>  		GROUP_LIST="$GROUP_LIST ${group//,/ }"
> -- 
> 2.18.0.rc1
> 

Re: [PATCH 1/2] check: recognize f2fs through parameter

[Eryu Guan]

On Sun, Sep 30, 2018 at 05:26:52PM +0800, Chao Yu wrote:
> Add a paramenter in check to configure $FSTYP for f2fs.
> 
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
>  check | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/check b/check
> index f3c8021d94b9..a9024094721a 100755
> --- a/check
> +++ b/check
> @@ -59,6 +59,7 @@ check options
>      -pvfs2          test PVFS2
>      -tmpfs              test TMPFS
>      -ubifs              test ubifs
> +    -f2fs		test f2fs
>      -l			line mode diff
>      -udiff		show unified diff (default)
>      -n			show me, do not run tests
> @@ -263,6 +264,7 @@ while [ $# -gt 0 ]; do
>  	-pvfs2)		FSTYP=pvfs2 ;;
>  	-tmpfs)		FSTYP=tmpfs ;;
>  	-ubifs)		FSTYP=ubifs ;;
> +	-f2fs)		FSTYP=f2fs ;;

The test harness should be able to detect the f2fs type from $TEST_DEV.
We add param to set FSTYP only when there's no way to tell the
filesystem type from the device.

Thanks,
Eryu

>  
>  	-g)	group=$2 ; shift ;
>  		GROUP_LIST="$GROUP_LIST ${group//,/ }"
> -- 
> 2.18.0.rc1
> 

Re: [PATCH 1/2] check: recognize f2fs through parameter

[Chao Yu]

On 2018-10-6 17:32, Eryu Guan wrote:
> On Sun, Sep 30, 2018 at 05:26:52PM +0800, Chao Yu wrote:
>> Add a paramenter in check to configure $FSTYP for f2fs.
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>>  check | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/check b/check
>> index f3c8021d94b9..a9024094721a 100755
>> --- a/check
>> +++ b/check
>> @@ -59,6 +59,7 @@ check options
>>      -pvfs2          test PVFS2
>>      -tmpfs              test TMPFS
>>      -ubifs              test ubifs
>> +    -f2fs		test f2fs
>>      -l			line mode diff
>>      -udiff		show unified diff (default)
>>      -n			show me, do not run tests
>> @@ -263,6 +264,7 @@ while [ $# -gt 0 ]; do
>>  	-pvfs2)		FSTYP=pvfs2 ;;
>>  	-tmpfs)		FSTYP=tmpfs ;;
>>  	-ubifs)		FSTYP=ubifs ;;
>> +	-f2fs)		FSTYP=f2fs ;;
> 
> The test harness should be able to detect the f2fs type from $TEST_DEV.
> We add param to set FSTYP only when there's no way to tell the
> filesystem type from the device.

Hi Eryu,

Okay, thanks for the explanation, let's just ignore this patch.

Thanks,

> 
> Thanks,
> Eryu
> 
>>  
>>  	-g)	group=$2 ; shift ;
>>  		GROUP_LIST="$GROUP_LIST ${group//,/ }"
>> -- 
>> 2.18.0.rc1
>>