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>

diff --git a/common/btrfs b/common/btrfs
index 3725632cc42041781d8d8a0e09289928a97314bf..6a1095ff89343c50dd41fafc30f24780f2b1fb35 100644 (file)
--- 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 51147c59f49b090f9d4b4199031d0d77e078582c..9ac997dbba61f4330e852a7abed4ef9d19bf4753 100755 (executable)
--- 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 5a9e98dea1bb70f01e5d88c81679901edd63bb8c..7d09aaad1a7d4d6e8676faca6c4357f0b4767164 100755 (executable)
--- 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 d931da8f0293baa400a2cf3ef174bc676d7cff81..01646157c833c0d1bbb3cb935ea5522a0a1a1cef 100755 (executable)
--- 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 f8785e830fa7d5802bc94123414e439e2d69ac3c..b9fdba6a232687443a5e1e2dddf9e5ac39d9dbd9 100755 (executable)
--- 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}