* [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions
@ 2025-04-17 12:27 Anand Jain
2025-04-22 15:56 ` Josef Bacik
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Anand Jain @ 2025-04-17 12:27 UTC (permalink / raw)
To: zlang; +Cc: fstests, linux-btrfs
Just adding a _ prefix to the two temp fsid helper functions and
a rename in common/btrfs to keep the coding style consistent.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
common/btrfs | 6 +++---
tests/btrfs/311 | 4 ++--
tests/btrfs/313 | 6 +++---
tests/btrfs/314 | 2 +-
tests/btrfs/315 | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/btrfs b/common/btrfs
index 3725632cc420..44c9d6a6777d 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -942,7 +942,7 @@ _has_btrfs_sysfs_feature_attr()
# Print the fsid and metadata uuid replaced with constant strings FSID and
# METADATA_UUID. Compare temp_fsid with fsid and metadata_uuid, then echo what
# it matches to or TEMP_FSID. This helps in comparing with the golden output.
-check_fsid()
+_check_temp_fsid()
{
local dev1=$1
local fsid
@@ -979,7 +979,7 @@ check_fsid()
cat /sys/fs/btrfs/$tempfsid/temp_fsid
}
-mkfs_clone()
+_mkfs_clone()
{
local fsid
local uuid
@@ -990,7 +990,7 @@ mkfs_clone()
_require_btrfs_mkfs_uuid_option
[[ -z $dev1 || -z $dev2 ]] && \
- _fail "mkfs_clone requires two devices as arguments"
+ _fail "_mkfs_clone requires two devices as arguments"
_mkfs_dev -fq $dev1
diff --git a/tests/btrfs/311 b/tests/btrfs/311
index 51147c59f49b..9ac997dbba61 100755
--- a/tests/btrfs/311
+++ b/tests/btrfs/311
@@ -47,7 +47,7 @@ same_dev_mount()
md5sum $SCRATCH_MNT/foo | _filter_scratch
md5sum $mnt1/bar | _filter_test_dir
- check_fsid $SCRATCH_DEV
+ _check_temp_fsid $SCRATCH_DEV
}
same_dev_subvol_mount()
@@ -69,7 +69,7 @@ same_dev_subvol_mount()
md5sum $SCRATCH_MNT/subvol/foo | _filter_scratch
md5sum $mnt1/bar | _filter_test_dir
- check_fsid $SCRATCH_DEV
+ _check_temp_fsid $SCRATCH_DEV
}
same_dev_mount
diff --git a/tests/btrfs/313 b/tests/btrfs/313
index 5a9e98dea1bb..d55667f733ee 100755
--- a/tests/btrfs/313
+++ b/tests/btrfs/313
@@ -30,15 +30,15 @@ mnt1=$TEST_DIR/$seq/mnt1
mkdir -p $mnt1
echo ---- clone_uuids_verify_tempfsid ----
-mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
+_mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
echo Mounting original device
_mount ${SCRATCH_DEV_NAME[0]} $SCRATCH_MNT
-check_fsid ${SCRATCH_DEV_NAME[0]}
+_check_temp_fsid ${SCRATCH_DEV_NAME[0]}
echo Mounting cloned device
_mount ${SCRATCH_DEV_NAME[1]} $mnt1
-check_fsid ${SCRATCH_DEV_NAME[1]}
+_check_temp_fsid ${SCRATCH_DEV_NAME[1]}
$XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | _filter_xfs_io
echo cp reflink must fail
diff --git a/tests/btrfs/314 b/tests/btrfs/314
index d931da8f0293..659a85d39886 100755
--- a/tests/btrfs/314
+++ b/tests/btrfs/314
@@ -36,7 +36,7 @@ send_receive_tempfsid()
local dst=$2
# Use first 2 devices from the SCRATCH_DEV_POOL
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
_scratch_mount
_mount $(_common_dev_mount_options) ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
diff --git a/tests/btrfs/315 b/tests/btrfs/315
index e6589abec08c..90f77413bedb 100755
--- a/tests/btrfs/315
+++ b/tests/btrfs/315
@@ -51,7 +51,7 @@ seed_device_must_fail()
{
echo ---- $FUNCNAME ----
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
$BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV}
$BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV_NAME[1]}
@@ -64,7 +64,7 @@ device_add_must_fail()
{
echo ---- $FUNCNAME ----
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
_scratch_mount
_mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
--
2.47.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions
2025-04-17 12:27 [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions Anand Jain
@ 2025-04-22 15:56 ` Josef Bacik
2025-04-23 14:29 ` Zorro Lang
2025-04-25 15:25 ` [PATCH v2] " Anand Jain
2 siblings, 0 replies; 5+ messages in thread
From: Josef Bacik @ 2025-04-22 15:56 UTC (permalink / raw)
To: Anand Jain; +Cc: zlang, fstests, linux-btrfs
On Thu, Apr 17, 2025 at 08:27:22PM +0800, Anand Jain wrote:
> Just adding a _ prefix to the two temp fsid helper functions and
> a rename in common/btrfs to keep the coding style consistent.
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Thanks,
Josef
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions
2025-04-17 12:27 [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions Anand Jain
2025-04-22 15:56 ` Josef Bacik
@ 2025-04-23 14:29 ` Zorro Lang
2025-04-25 15:23 ` Anand Jain
2025-04-25 15:25 ` [PATCH v2] " Anand Jain
2 siblings, 1 reply; 5+ messages in thread
From: Zorro Lang @ 2025-04-23 14:29 UTC (permalink / raw)
To: Anand Jain; +Cc: fstests, linux-btrfs
On Thu, Apr 17, 2025 at 08:27:22PM +0800, Anand Jain wrote:
> Just adding a _ prefix to the two temp fsid helper functions and
> a rename in common/btrfs to keep the coding style consistent.
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
Looks good to me, I'm just wondering if the _mkfs_clone should be
_btrfs_mkfs_clone, due to it looks like a btrfs specific helpers
and this kind of helpers nearly all have a "_btrfs" prefix.
Reviewed-by: Zorro Lang <zlang@redhat.com>
> common/btrfs | 6 +++---
> tests/btrfs/311 | 4 ++--
> tests/btrfs/313 | 6 +++---
> tests/btrfs/314 | 2 +-
> tests/btrfs/315 | 4 ++--
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/common/btrfs b/common/btrfs
> index 3725632cc420..44c9d6a6777d 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -942,7 +942,7 @@ _has_btrfs_sysfs_feature_attr()
> # Print the fsid and metadata uuid replaced with constant strings FSID and
> # METADATA_UUID. Compare temp_fsid with fsid and metadata_uuid, then echo what
> # it matches to or TEMP_FSID. This helps in comparing with the golden output.
> -check_fsid()
> +_check_temp_fsid()
> {
> local dev1=$1
> local fsid
> @@ -979,7 +979,7 @@ check_fsid()
> cat /sys/fs/btrfs/$tempfsid/temp_fsid
> }
>
> -mkfs_clone()
> +_mkfs_clone()
> {
> local fsid
> local uuid
> @@ -990,7 +990,7 @@ mkfs_clone()
> _require_btrfs_mkfs_uuid_option
>
> [[ -z $dev1 || -z $dev2 ]] && \
> - _fail "mkfs_clone requires two devices as arguments"
> + _fail "_mkfs_clone requires two devices as arguments"
>
> _mkfs_dev -fq $dev1
>
> diff --git a/tests/btrfs/311 b/tests/btrfs/311
> index 51147c59f49b..9ac997dbba61 100755
> --- a/tests/btrfs/311
> +++ b/tests/btrfs/311
> @@ -47,7 +47,7 @@ same_dev_mount()
> md5sum $SCRATCH_MNT/foo | _filter_scratch
> md5sum $mnt1/bar | _filter_test_dir
>
> - check_fsid $SCRATCH_DEV
> + _check_temp_fsid $SCRATCH_DEV
> }
>
> same_dev_subvol_mount()
> @@ -69,7 +69,7 @@ same_dev_subvol_mount()
> md5sum $SCRATCH_MNT/subvol/foo | _filter_scratch
> md5sum $mnt1/bar | _filter_test_dir
>
> - check_fsid $SCRATCH_DEV
> + _check_temp_fsid $SCRATCH_DEV
> }
>
> same_dev_mount
> diff --git a/tests/btrfs/313 b/tests/btrfs/313
> index 5a9e98dea1bb..d55667f733ee 100755
> --- a/tests/btrfs/313
> +++ b/tests/btrfs/313
> @@ -30,15 +30,15 @@ mnt1=$TEST_DIR/$seq/mnt1
> mkdir -p $mnt1
>
> echo ---- clone_uuids_verify_tempfsid ----
> -mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
> +_mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
>
> echo Mounting original device
> _mount ${SCRATCH_DEV_NAME[0]} $SCRATCH_MNT
> -check_fsid ${SCRATCH_DEV_NAME[0]}
> +_check_temp_fsid ${SCRATCH_DEV_NAME[0]}
>
> echo Mounting cloned device
> _mount ${SCRATCH_DEV_NAME[1]} $mnt1
> -check_fsid ${SCRATCH_DEV_NAME[1]}
> +_check_temp_fsid ${SCRATCH_DEV_NAME[1]}
>
> $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | _filter_xfs_io
> echo cp reflink must fail
> diff --git a/tests/btrfs/314 b/tests/btrfs/314
> index d931da8f0293..659a85d39886 100755
> --- a/tests/btrfs/314
> +++ b/tests/btrfs/314
> @@ -36,7 +36,7 @@ send_receive_tempfsid()
> local dst=$2
>
> # Use first 2 devices from the SCRATCH_DEV_POOL
> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
> _scratch_mount
> _mount $(_common_dev_mount_options) ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
>
> diff --git a/tests/btrfs/315 b/tests/btrfs/315
> index e6589abec08c..90f77413bedb 100755
> --- a/tests/btrfs/315
> +++ b/tests/btrfs/315
> @@ -51,7 +51,7 @@ seed_device_must_fail()
> {
> echo ---- $FUNCNAME ----
>
> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>
> $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV}
> $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV_NAME[1]}
> @@ -64,7 +64,7 @@ device_add_must_fail()
> {
> echo ---- $FUNCNAME ----
>
> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
> _scratch_mount
> _mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
>
> --
> 2.47.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions
2025-04-23 14:29 ` Zorro Lang
@ 2025-04-25 15:23 ` Anand Jain
0 siblings, 0 replies; 5+ messages in thread
From: Anand Jain @ 2025-04-25 15:23 UTC (permalink / raw)
To: Zorro Lang; +Cc: fstests, linux-btrfs
On 23/4/25 19:59, Zorro Lang wrote:
> On Thu, Apr 17, 2025 at 08:27:22PM +0800, Anand Jain wrote:
>> Just adding a _ prefix to the two temp fsid helper functions and
>> a rename in common/btrfs to keep the coding style consistent.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>
> Looks good to me, I'm just wondering if the _mkfs_clone should be
> _btrfs_mkfs_clone, due to it looks like a btrfs specific helpers
> and this kind of helpers nearly all have a "_btrfs" prefix.
Yeah, it should have been prefixed with "btrfs". Fixed locally; v2 sent.
Thanks, Anand
>
> Reviewed-by: Zorro Lang <zlang@redhat.com>
>
>> common/btrfs | 6 +++---
>> tests/btrfs/311 | 4 ++--
>> tests/btrfs/313 | 6 +++---
>> tests/btrfs/314 | 2 +-
>> tests/btrfs/315 | 4 ++--
>> 5 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/common/btrfs b/common/btrfs
>> index 3725632cc420..44c9d6a6777d 100644
>> --- a/common/btrfs
>> +++ b/common/btrfs
>> @@ -942,7 +942,7 @@ _has_btrfs_sysfs_feature_attr()
>> # Print the fsid and metadata uuid replaced with constant strings FSID and
>> # METADATA_UUID. Compare temp_fsid with fsid and metadata_uuid, then echo what
>> # it matches to or TEMP_FSID. This helps in comparing with the golden output.
>> -check_fsid()
>> +_check_temp_fsid()
>> {
>> local dev1=$1
>> local fsid
>> @@ -979,7 +979,7 @@ check_fsid()
>> cat /sys/fs/btrfs/$tempfsid/temp_fsid
>> }
>>
>> -mkfs_clone()
>> +_mkfs_clone()
>> {
>> local fsid
>> local uuid
>> @@ -990,7 +990,7 @@ mkfs_clone()
>> _require_btrfs_mkfs_uuid_option
>>
>> [[ -z $dev1 || -z $dev2 ]] && \
>> - _fail "mkfs_clone requires two devices as arguments"
>> + _fail "_mkfs_clone requires two devices as arguments"
>>
>> _mkfs_dev -fq $dev1
>>
>> diff --git a/tests/btrfs/311 b/tests/btrfs/311
>> index 51147c59f49b..9ac997dbba61 100755
>> --- a/tests/btrfs/311
>> +++ b/tests/btrfs/311
>> @@ -47,7 +47,7 @@ same_dev_mount()
>> md5sum $SCRATCH_MNT/foo | _filter_scratch
>> md5sum $mnt1/bar | _filter_test_dir
>>
>> - check_fsid $SCRATCH_DEV
>> + _check_temp_fsid $SCRATCH_DEV
>> }
>>
>> same_dev_subvol_mount()
>> @@ -69,7 +69,7 @@ same_dev_subvol_mount()
>> md5sum $SCRATCH_MNT/subvol/foo | _filter_scratch
>> md5sum $mnt1/bar | _filter_test_dir
>>
>> - check_fsid $SCRATCH_DEV
>> + _check_temp_fsid $SCRATCH_DEV
>> }
>>
>> same_dev_mount
>> diff --git a/tests/btrfs/313 b/tests/btrfs/313
>> index 5a9e98dea1bb..d55667f733ee 100755
>> --- a/tests/btrfs/313
>> +++ b/tests/btrfs/313
>> @@ -30,15 +30,15 @@ mnt1=$TEST_DIR/$seq/mnt1
>> mkdir -p $mnt1
>>
>> echo ---- clone_uuids_verify_tempfsid ----
>> -mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
>> +_mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
>>
>> echo Mounting original device
>> _mount ${SCRATCH_DEV_NAME[0]} $SCRATCH_MNT
>> -check_fsid ${SCRATCH_DEV_NAME[0]}
>> +_check_temp_fsid ${SCRATCH_DEV_NAME[0]}
>>
>> echo Mounting cloned device
>> _mount ${SCRATCH_DEV_NAME[1]} $mnt1
>> -check_fsid ${SCRATCH_DEV_NAME[1]}
>> +_check_temp_fsid ${SCRATCH_DEV_NAME[1]}
>>
>> $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | _filter_xfs_io
>> echo cp reflink must fail
>> diff --git a/tests/btrfs/314 b/tests/btrfs/314
>> index d931da8f0293..659a85d39886 100755
>> --- a/tests/btrfs/314
>> +++ b/tests/btrfs/314
>> @@ -36,7 +36,7 @@ send_receive_tempfsid()
>> local dst=$2
>>
>> # Use first 2 devices from the SCRATCH_DEV_POOL
>> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>> _scratch_mount
>> _mount $(_common_dev_mount_options) ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
>>
>> diff --git a/tests/btrfs/315 b/tests/btrfs/315
>> index e6589abec08c..90f77413bedb 100755
>> --- a/tests/btrfs/315
>> +++ b/tests/btrfs/315
>> @@ -51,7 +51,7 @@ seed_device_must_fail()
>> {
>> echo ---- $FUNCNAME ----
>>
>> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>>
>> $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV}
>> $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV_NAME[1]}
>> @@ -64,7 +64,7 @@ device_add_must_fail()
>> {
>> echo ---- $FUNCNAME ----
>>
>> - mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>> + _mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
>> _scratch_mount
>> _mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
>>
>> --
>> 2.47.0
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] fstests: common/btrfs: add _ prefix to temp fsid helper functions
2025-04-17 12:27 [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions Anand Jain
2025-04-22 15:56 ` Josef Bacik
2025-04-23 14:29 ` Zorro Lang
@ 2025-04-25 15:25 ` Anand Jain
2 siblings, 0 replies; 5+ messages in thread
From: Anand Jain @ 2025-04-25 15:25 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, zlang
Just adding a _ prefix to the two temp fsid helper functions and
a rename in common/btrfs to keep the coding style consistent.
Reviewed-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2:
rename _mkfs_clone to _btrfs_mkfs_clone
common/btrfs | 6 +++---
tests/btrfs/311 | 4 ++--
tests/btrfs/313 | 6 +++---
tests/btrfs/314 | 2 +-
tests/btrfs/315 | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/btrfs b/common/btrfs
index 3725632cc420..6a1095ff8934 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -942,7 +942,7 @@ _has_btrfs_sysfs_feature_attr()
# Print the fsid and metadata uuid replaced with constant strings FSID and
# METADATA_UUID. Compare temp_fsid with fsid and metadata_uuid, then echo what
# it matches to or TEMP_FSID. This helps in comparing with the golden output.
-check_fsid()
+_check_temp_fsid()
{
local dev1=$1
local fsid
@@ -979,7 +979,7 @@ check_fsid()
cat /sys/fs/btrfs/$tempfsid/temp_fsid
}
-mkfs_clone()
+_btrfs_mkfs_clone()
{
local fsid
local uuid
@@ -990,7 +990,7 @@ mkfs_clone()
_require_btrfs_mkfs_uuid_option
[[ -z $dev1 || -z $dev2 ]] && \
- _fail "mkfs_clone requires two devices as arguments"
+ _fail "_btrfs_mkfs_clone requires two devices as arguments"
_mkfs_dev -fq $dev1
diff --git a/tests/btrfs/311 b/tests/btrfs/311
index 51147c59f49b..9ac997dbba61 100755
--- a/tests/btrfs/311
+++ b/tests/btrfs/311
@@ -47,7 +47,7 @@ same_dev_mount()
md5sum $SCRATCH_MNT/foo | _filter_scratch
md5sum $mnt1/bar | _filter_test_dir
- check_fsid $SCRATCH_DEV
+ _check_temp_fsid $SCRATCH_DEV
}
same_dev_subvol_mount()
@@ -69,7 +69,7 @@ same_dev_subvol_mount()
md5sum $SCRATCH_MNT/subvol/foo | _filter_scratch
md5sum $mnt1/bar | _filter_test_dir
- check_fsid $SCRATCH_DEV
+ _check_temp_fsid $SCRATCH_DEV
}
same_dev_mount
diff --git a/tests/btrfs/313 b/tests/btrfs/313
index 5a9e98dea1bb..7d09aaad1a7d 100755
--- a/tests/btrfs/313
+++ b/tests/btrfs/313
@@ -30,15 +30,15 @@ mnt1=$TEST_DIR/$seq/mnt1
mkdir -p $mnt1
echo ---- clone_uuids_verify_tempfsid ----
-mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
+_btrfs_mkfs_clone ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
echo Mounting original device
_mount ${SCRATCH_DEV_NAME[0]} $SCRATCH_MNT
-check_fsid ${SCRATCH_DEV_NAME[0]}
+_check_temp_fsid ${SCRATCH_DEV_NAME[0]}
echo Mounting cloned device
_mount ${SCRATCH_DEV_NAME[1]} $mnt1
-check_fsid ${SCRATCH_DEV_NAME[1]}
+_check_temp_fsid ${SCRATCH_DEV_NAME[1]}
$XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | _filter_xfs_io
echo cp reflink must fail
diff --git a/tests/btrfs/314 b/tests/btrfs/314
index d931da8f0293..01646157c833 100755
--- a/tests/btrfs/314
+++ b/tests/btrfs/314
@@ -36,7 +36,7 @@ send_receive_tempfsid()
local dst=$2
# Use first 2 devices from the SCRATCH_DEV_POOL
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _btrfs_mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
_scratch_mount
_mount $(_common_dev_mount_options) ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
diff --git a/tests/btrfs/315 b/tests/btrfs/315
index f8785e830fa7..b9fdba6a2326 100755
--- a/tests/btrfs/315
+++ b/tests/btrfs/315
@@ -32,7 +32,7 @@ seed_device_must_fail()
{
echo ---- $FUNCNAME ----
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _btrfs_mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
$BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV}
$BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV_NAME[1]}
@@ -45,7 +45,7 @@ device_add_must_fail()
{
echo ---- $FUNCNAME ----
- mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
+ _btrfs_mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]}
_scratch_mount
_mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt}
--
2.49.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-04-25 15:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-17 12:27 [PATCH] fstests: common/btrfs: add _ prefix to temp fsid helper functions Anand Jain
2025-04-22 15:56 ` Josef Bacik
2025-04-23 14:29 ` Zorro Lang
2025-04-25 15:23 ` Anand Jain
2025-04-25 15:25 ` [PATCH v2] " Anand Jain
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox