[PATCH] common/rc: fix to check inode creation on scratch_mnt in _require_btime()

[PATCH] common/rc: fix to check inode creation on scratch_mnt in _require_btime()

[Chao Yu]

_require_btime() should check inode creation feature on SCRATCH_MNT
mountpoint intead of TEST_DIR mountpoint, otherwise generic/508 will
fail due to incorrect check of this function.

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

diff --git a/common/rc b/common/rc
index b4987a9cd7f7..5154241a5cee 100644
--- a/common/rc
+++ b/common/rc
@@ -3845,10 +3845,10 @@ _dmsetup_create()
 
 _require_btime()
 {
-	$XFS_IO_PROG -f $TEST_DIR/test_creation_time -c "statx -v" \
+	$XFS_IO_PROG -f $SCRATCH_MNT/test_creation_time -c "statx -v" \
 		| grep btime >>$seqres.full 2>&1 || \
 		_notrun "inode creation time not supported by this filesystem"
-	rm -f $TEST_DIR/test_creation_time
+	rm -f $SCRATCH_MNT/test_creation_time
 }
 
 init_rc
-- 
2.18.0.rc1

Re: [PATCH] common/rc: fix to check inode creation on scratch_mnt in _require_btime()

[Dave Chinner]

On Wed, Oct 24, 2018 at 10:26:45AM +0800, Chao Yu wrote:
> _require_btime() should check inode creation feature on SCRATCH_MNT
> mountpoint intead of TEST_DIR mountpoint, otherwise generic/508 will
> fail due to incorrect check of this function.
> 
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
>  common/rc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index b4987a9cd7f7..5154241a5cee 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3845,10 +3845,10 @@ _dmsetup_create()
>  
>  _require_btime()
>  {
> -	$XFS_IO_PROG -f $TEST_DIR/test_creation_time -c "statx -v" \
> +	$XFS_IO_PROG -f $SCRATCH_MNT/test_creation_time -c "statx -v" \
>  		| grep btime >>$seqres.full 2>&1 || \
>  		_notrun "inode creation time not supported by this filesystem"
> -	rm -f $TEST_DIR/test_creation_time
> +	rm -f $SCRATCH_MNT/test_creation_time
>  }

This doesn't work. the scratch device is not mounted at the time
generic/508 calls it.

If you are going to check the scratch device, the function needs to
be called _require_scratch_btime and be called after
scratch_mkfs/scratch_mount has been run by the test.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH] common/rc: fix to check inode creation on scratch_mnt in _require_btime()

[Chao Yu]

On 2018/10/24 12:45, Dave Chinner wrote:
> On Wed, Oct 24, 2018 at 10:26:45AM +0800, Chao Yu wrote:
>> _require_btime() should check inode creation feature on SCRATCH_MNT
>> mountpoint intead of TEST_DIR mountpoint, otherwise generic/508 will
>> fail due to incorrect check of this function.
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>>  common/rc | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/common/rc b/common/rc
>> index b4987a9cd7f7..5154241a5cee 100644
>> --- a/common/rc
>> +++ b/common/rc
>> @@ -3845,10 +3845,10 @@ _dmsetup_create()
>>  
>>  _require_btime()
>>  {
>> -	$XFS_IO_PROG -f $TEST_DIR/test_creation_time -c "statx -v" \
>> +	$XFS_IO_PROG -f $SCRATCH_MNT/test_creation_time -c "statx -v" \
>>  		| grep btime >>$seqres.full 2>&1 || \
>>  		_notrun "inode creation time not supported by this filesystem"
>> -	rm -f $TEST_DIR/test_creation_time
>> +	rm -f $SCRATCH_MNT/test_creation_time
>>  }
> 
> This doesn't work. the scratch device is not mounted at the time
> generic/508 calls it.
> 
> If you are going to check the scratch device, the function needs to
> be called _require_scratch_btime and be called after
> scratch_mkfs/scratch_mount has been run by the test.
That's correct, I've fixed in v2, could you please help to check that?

Thanks,

> 
> Cheers,
> 
> Dave.
>