commit 008ffc6232320acf3699a4868b0aabaa3caa7934
author Anand Jain <anand.jain@oracle.com> Thu Apr 17 20:27:22 2025 +0800
committer Zorro Lang <zlang@kernel.org> Sat Apr 26 20:53:52 2025 +0800
tree 56f59cac3a11509ad61c95bc320bd6f832f55a46
parent a7640a40da6457edda50c3f1987ed43043d466ec

fstests: common/btrfs: add _ prefix to temp fsid helper functions

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>

common/btrfs

diff --git a/common/btrfs b/common/btrfs
index 3725632..6a1095f 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -942,7 +942,7 @@
 # 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 @@
 	cat /sys/fs/btrfs/$tempfsid/temp_fsid
 }
 
-mkfs_clone()
+_btrfs_mkfs_clone()
 {
 	local fsid
 	local uuid
@@ -990,7 +990,7 @@
 	_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
 

tests/btrfs/311

diff --git a/tests/btrfs/311 b/tests/btrfs/311
index 51147c5..9ac997d 100755
--- a/tests/btrfs/311
+++ b/tests/btrfs/311
@@ -47,7 +47,7 @@
 	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 @@
 	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

tests/btrfs/313

diff --git a/tests/btrfs/313 b/tests/btrfs/313
index 5a9e98d..7d09aaa 100755
--- a/tests/btrfs/313
+++ b/tests/btrfs/313
@@ -30,15 +30,15 @@
 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

tests/btrfs/314

diff --git a/tests/btrfs/314 b/tests/btrfs/314
index d931da8..0164615 100755
--- a/tests/btrfs/314
+++ b/tests/btrfs/314
@@ -36,7 +36,7 @@
 	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}
 

tests/btrfs/315

diff --git a/tests/btrfs/315 b/tests/btrfs/315
index f8785e8..b9fdba6 100755
--- a/tests/btrfs/315
+++ b/tests/btrfs/315
@@ -32,7 +32,7 @@
 {
 	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 @@
 {
 	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}