common: add leading underscore to get_block_size

Add a leading underscore to the get_block_size helper since it's a
common function.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/attr b/common/attr
index ce2d76a9f93142f6a29712caac3777f069d6e123..08643e6fec3f7ac3deefe3ea861700d371ba2d36 100644 (file)
--- a/common/attr
+++ b/common/attr
@@ -257,7 +257,7 @@ _sort_getfattr_output()
 if [ "$FSTYP" == "xfs" -o "$FSTYP" == "udf" ]; then
        MAX_ATTRS=1000
 else # Assume max ~1 block of attrs
 if [ "$FSTYP" == "xfs" -o "$FSTYP" == "udf" ]; then
        MAX_ATTRS=1000
 else # Assume max ~1 block of attrs

-       BLOCK_SIZE=`get_block_size $TEST_DIR`
+       BLOCK_SIZE=`_get_block_size $TEST_DIR`

        # user.attribute_XXX="value.XXX" is about 32 bytes; leave some overhead
        let MAX_ATTRS=$BLOCK_SIZE/40
 fi
        # user.attribute_XXX="value.XXX" is about 32 bytes; leave some overhead
        let MAX_ATTRS=$BLOCK_SIZE/40
 fi


@@ -268,7 +268,7 @@ export MAX_ATTRS
 if [ "$FSTYP" == "xfs" -o "$FSTYP" == "udf" -o "$FSTYP" == "btrfs" ]; then
        MAX_ATTRVAL_SIZE=64
 else # Assume max ~1 block of attrs
 if [ "$FSTYP" == "xfs" -o "$FSTYP" == "udf" -o "$FSTYP" == "btrfs" ]; then
        MAX_ATTRVAL_SIZE=64
 else # Assume max ~1 block of attrs

-       BLOCK_SIZE=`get_block_size $TEST_DIR`
+       BLOCK_SIZE=`_get_block_size $TEST_DIR`

        # leave a little overhead
        let MAX_ATTRVAL_SIZE=$BLOCK_SIZE-256
 fi
        # leave a little overhead
        let MAX_ATTRVAL_SIZE=$BLOCK_SIZE-256
 fi

diff --git a/common/defrag b/common/defrag
index 986b4bf254f90f637fdac7f90b189d725fcaadb5..d279382f4b56e3239a7f7d3a1e96672c9f7a521b 100644 (file)
--- a/common/defrag
+++ b/common/defrag
@@ -29,7 +29,7 @@ _require_defrag()
     ext4|ext4dev)
        testfile="$TEST_DIR/$$-test.defrag"
        donorfile="$TEST_DIR/$$-donor.defrag"
     ext4|ext4dev)
        testfile="$TEST_DIR/$$-test.defrag"
        donorfile="$TEST_DIR/$$-donor.defrag"

-       bsize=`get_block_size $TEST_DIR`
+       bsize=`_get_block_size $TEST_DIR`

        $XFS_IO_PROG -f -c "pwrite -b $bsize 0 $bsize" $testfile > /dev/null
        cp $testfile $donorfile
        echo $testfile | $here/src/e4compact -v -f $donorfile | \
        $XFS_IO_PROG -f -c "pwrite -b $bsize 0 $bsize" $testfile > /dev/null
        cp $testfile $donorfile
        echo $testfile | $here/src/e4compact -v -f $donorfile | \

diff --git a/common/filter b/common/filter
index 98eff57333579e5b2a41308578832c9057ab6cff..e39ac0e298006612c54eb8e8c92e07ebef84645b 100644 (file)
--- a/common/filter
+++ b/common/filter
@@ -265,7 +265,7 @@ _filter_xfs_io_units_modified()
 
 _filter_xfs_io_blocks_modified()
 {
 
 _filter_xfs_io_blocks_modified()
 {

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
        _filter_xfs_io_units_modified "Block" $BLOCK_SIZE
 }
 
        _filter_xfs_io_units_modified "Block" $BLOCK_SIZE
 }


@@ -383,7 +383,7 @@ _filter_ro_mount() {
 
 _filter_od()
 {
 
 _filter_od()
 {

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

        $AWK_PROG -v block_size=$BLOCK_SIZE '
                /^[0-9]+/ {
                        offset = strtonum("0"$1);
        $AWK_PROG -v block_size=$BLOCK_SIZE '
                /^[0-9]+/ {
                        offset = strtonum("0"$1);

diff --git a/common/punch b/common/punch
index 44c6e1c9436f57ea7e662e5eacaac80c4bab8f26..c4ed26192a2219e232202ecda9486e55a432f90d 100644 (file)
--- a/common/punch
+++ b/common/punch
@@ -584,7 +584,7 @@ _test_generic_punch()
        if [ "$remove_testfile" ]; then
                rm -f $testfile
        fi
        if [ "$remove_testfile" ]; then
                rm -f $testfile
        fi

-       block_size=`get_block_size $TEST_DIR`
+       block_size=`_get_block_size $TEST_DIR`

        $XFS_IO_PROG -f -c "truncate $block_size" \
                -c "pwrite 0 $block_size" $sync_cmd \
                -c "$zero_cmd 128 128" \
        $XFS_IO_PROG -f -c "truncate $block_size" \
                -c "pwrite 0 $block_size" $sync_cmd \
                -c "$zero_cmd 128 128" \

diff --git a/common/rc b/common/rc
index 37d0fc8c4f31925e384a322fe7b8ad4671ae21c9..a69aa930b7d7f698bb46fc9ac4a998feb10721cd 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -3125,10 +3125,10 @@ _sysfs_dev()
        echo /sys/dev/block/$_maj:$_min
 }
 
        echo /sys/dev/block/$_maj:$_min
 }
 

-get_block_size()
+_get_block_size()

 {
        if [ -z $1 ] || [ ! -d $1 ]; then
 {
        if [ -z $1 ] || [ ! -d $1 ]; then

-               echo "Missing mount point argument for get_block_size"
+               echo "Missing mount point argument for _get_block_size"

                exit 1
        fi
        echo `stat -f -c %S $1`
                exit 1
        fi
        echo `stat -f -c %S $1`

diff --git a/tests/btrfs/012 b/tests/btrfs/012
index cbd3882e42746e05e18b34ae447d061f2d30afb2..6a3cb816d526e641e1c0a21ff2075dfb228720fb 100755 (executable)
--- a/tests/btrfs/012
+++ b/tests/btrfs/012
@@ -63,7 +63,7 @@ _require_command "$E2FSCK_PROG" e2fsck
 
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 

-BLOCK_SIZE=`get_block_size $TEST_DIR`
+BLOCK_SIZE=`_get_block_size $TEST_DIR`

 
 # Create & populate an ext4 filesystem
 $MKFS_EXT4_PROG -F -b $BLOCK_SIZE $SCRATCH_DEV > $seqres.full 2>&1 || \
 
 # Create & populate an ext4 filesystem
 $MKFS_EXT4_PROG -F -b $BLOCK_SIZE $SCRATCH_DEV > $seqres.full 2>&1 || \

diff --git a/tests/btrfs/017 b/tests/btrfs/017
index 3f409d31e71c52d0935cd6a382f688544116d059..1041957f55135fde938ce88d5f08bf986dff4fc3 100755 (executable)
--- a/tests/btrfs/017
+++ b/tests/btrfs/017
@@ -62,7 +62,7 @@ rm -f $seqres.full
 _scratch_mkfs "--nodesize 65536" >>$seqres.full 2>&1
 _scratch_mount
 
 _scratch_mkfs "--nodesize 65536" >>$seqres.full 2>&1
 _scratch_mount
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 
 $XFS_IO_PROG -f -d -c "pwrite 0 $EXTENT_SIZE" $SCRATCH_MNT/foo \
 EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 
 $XFS_IO_PROG -f -d -c "pwrite 0 $EXTENT_SIZE" $SCRATCH_MNT/foo \

diff --git a/tests/btrfs/052 b/tests/btrfs/052
index 599d2616f92f322154204c5c1698acb67494ba20..c76d245603fbd82c51bebc7403b161a9de568388 100755 (executable)
--- a/tests/btrfs/052
+++ b/tests/btrfs/052
@@ -58,7 +58,7 @@ test_btrfs_clone_same_file()
        _scratch_mkfs >/dev/null 2>&1
        _scratch_mount $MOUNT_OPTIONS
 
        _scratch_mkfs >/dev/null 2>&1
        _scratch_mount $MOUNT_OPTIONS
 

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 
 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 

diff --git a/tests/btrfs/055 b/tests/btrfs/055
index 29afdbaafb31fbc13075295703d0e2685979aa9d..481d5c8468faecbace9e5bac77fba02cdc2cbbcf 100755 (executable)
--- a/tests/btrfs/055
+++ b/tests/btrfs/055
@@ -59,7 +59,7 @@ test_btrfs_clone_with_holes()
        _scratch_mkfs "$1" >/dev/null 2>&1
        _scratch_mount
 
        _scratch_mkfs "$1" >/dev/null 2>&1
        _scratch_mount
 

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 
 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 

diff --git a/tests/btrfs/056 b/tests/btrfs/056
index ef515a1e006249a0df608da04b75f65a95f68b21..d9b6fd7451f7a5dc4d55bcd84390295e2d46dcf4 100755 (executable)
--- a/tests/btrfs/056
+++ b/tests/btrfs/056
@@ -67,7 +67,7 @@ test_btrfs_clone_fsync_log_recover()
        MOUNT_OPTIONS="$MOUNT_OPTIONS $2"
        _mount_flakey
 
        MOUNT_OPTIONS="$MOUNT_OPTIONS $2"
        _mount_flakey
 

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 
 
        EXTENT_SIZE=$((2 * $BLOCK_SIZE))
 

diff --git a/tests/btrfs/094 b/tests/btrfs/094
index 52b7ed2c5839f9850eb081cc769500234333abdc..452c0084066880e5ac95f336f6591e5fce6b0bdf 100755 (executable)
--- a/tests/btrfs/094
+++ b/tests/btrfs/094
@@ -66,7 +66,7 @@ mkdir $send_files_dir
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount "-o compress"
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount "-o compress"
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
 # Create the file with a single extent of 32 blocks. This creates a metadata
 # file extent item with a data start offset of 0 and a logical length of
 
 # Create the file with a single extent of 32 blocks. This creates a metadata
 # file extent item with a data start offset of 0 and a logical length of

diff --git a/tests/btrfs/095 b/tests/btrfs/095
index b477b5714c2b52a717ff9e5f86e1ac004a50fc9f..f256e8892238ee2fe2b5a1eff6e85093e622fba2 100755 (executable)
--- a/tests/btrfs/095
+++ b/tests/btrfs/095
@@ -62,7 +62,7 @@ _scratch_mkfs >>$seqres.full 2>&1
 _init_flakey
 _mount_flakey
 
 _init_flakey
 _mount_flakey
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
 # Create prealloc extent covering file block range [40, 155[
 $XFS_IO_PROG -f -c "falloc $((40 * $BLOCK_SIZE)) $((115 * $BLOCK_SIZE))" \
 
 # Create prealloc extent covering file block range [40, 155[
 $XFS_IO_PROG -f -c "falloc $((40 * $BLOCK_SIZE)) $((115 * $BLOCK_SIZE))" \

diff --git a/tests/btrfs/096 b/tests/btrfs/096
index 039e09db0da9506bd5a962ffcd945387deb337f5..fd13cf7235fd3abf8b2b204774cfd2ebc66af27a 100755 (executable)
--- a/tests/btrfs/096
+++ b/tests/btrfs/096
@@ -50,7 +50,7 @@ rm -f $seqres.full
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
 # Create our test files. File foo has the same 2k of data at offset $BLOCK_SIZE
 # as file bar has at its offset 0.
 
 # Create our test files. File foo has the same 2k of data at offset $BLOCK_SIZE
 # as file bar has at its offset 0.

diff --git a/tests/btrfs/097 b/tests/btrfs/097
index 4b4dd18c4f4c03e841e6bdaf494571710d8f8a3d..d83cc4628829cf578e9390492062e6344516d3fe 100755 (executable)
--- a/tests/btrfs/097
+++ b/tests/btrfs/097
@@ -56,7 +56,7 @@ mkdir $send_files_dir
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
 # Create our test file with a single extent of 16 blocks starting at a file
 # offset mapped by 32nd block.
 
 # Create our test file with a single extent of 16 blocks starting at a file
 # offset mapped by 32nd block.

diff --git a/tests/btrfs/098 b/tests/btrfs/098
index f916c37ae94b36a0eb75dc2b00f734c0d486662a..ba95fd390db0eef18655c5ed82aa6ad70b617c81 100755 (executable)
--- a/tests/btrfs/098
+++ b/tests/btrfs/098
@@ -57,7 +57,7 @@ _scratch_mkfs >>$seqres.full 2>&1
 _init_flakey
 _mount_flakey
 
 _init_flakey
 _mount_flakey
 

-BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
 # Create our test file with a single 25 block extent starting at file offset
 # mapped by 200th block We fsync the file here to make the fsync log tree get a
 
 # Create our test file with a single 25 block extent starting at file offset
 # mapped by 200th block We fsync the file here to make the fsync log tree get a

diff --git a/tests/btrfs/103 b/tests/btrfs/103
index caa979a497cb0bf2a1d5433c261cfe320515d2ee..b672d62e750642bfb530b2c5dcc28a46b27577ae 100755 (executable)
--- a/tests/btrfs/103
+++ b/tests/btrfs/103
@@ -55,7 +55,7 @@ test_clone_and_read_compressed_extent()
        _scratch_mkfs >>$seqres.full 2>&1
        _scratch_mount $mount_opts
 
        _scratch_mkfs >>$seqres.full 2>&1
        _scratch_mount $mount_opts
 

-       BLOCK_SIZE=$(get_block_size $SCRATCH_MNT)
+       BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)

 
        # Create a test file with a single extent that is compressed (the
        # data we write into it is highly compressible no matter which
 
        # Create a test file with a single extent that is compressed (the
        # data we write into it is highly compressible no matter which

diff --git a/tests/generic/017 b/tests/generic/017
index 5fe46281b7d1670728ea39e8d3546b9c6fe5478b..419e76238e4d5ff5e2fc76b9681a09963c9af203 100755 (executable)
--- a/tests/generic/017
+++ b/tests/generic/017
@@ -53,7 +53,7 @@ _scratch_mount
 testfile=$SCRATCH_MNT/$seq.$$
 BLOCKS=10240
 
 testfile=$SCRATCH_MNT/$seq.$$
 BLOCKS=10240
 

-BSIZE=`get_block_size $SCRATCH_MNT`
+BSIZE=`_get_block_size $SCRATCH_MNT`

 
 length=$(($BLOCKS * $BSIZE))
 
 
 length=$(($BLOCKS * $BSIZE))
 

diff --git a/tests/generic/064 b/tests/generic/064
index d384a9ad6eb8a2c7e296c063c8b0591c10250c7e..8cd31b3c7a60d3db2986e7154114bd4ab874f4f1 100755 (executable)
--- a/tests/generic/064
+++ b/tests/generic/064
@@ -49,7 +49,7 @@ _require_xfs_io_command "fcollapse"
 src=$SCRATCH_MNT/testfile
 dest=$SCRATCH_MNT/testfile.dest
 BLOCKS=100
 src=$SCRATCH_MNT/testfile
 dest=$SCRATCH_MNT/testfile.dest
 BLOCKS=100

-BSIZE=`get_block_size $SCRATCH_MNT`
+BSIZE=`_get_block_size $SCRATCH_MNT`

 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/150 b/tests/generic/150
index fadbb424bf82bf690ac455114a15c59c95e1113e..b57db51a7a84e7e8971c2d8276f1aa0080fac890 100755 (executable)
--- a/tests/generic/150
+++ b/tests/generic/150
@@ -55,7 +55,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/151 b/tests/generic/151
index b0f0521867373125df0b320ecf2b466fc64ea38c..efb93ed282897b71cad63968e4588542781ebf54 100755 (executable)
--- a/tests/generic/151
+++ b/tests/generic/151
@@ -59,7 +59,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/152 b/tests/generic/152
index aa10bcfa2915c965da92ffbbcae4ae968d51afad..ee009ea95c7068197056a42022e0a3aafbfa7459 100755 (executable)
--- a/tests/generic/152
+++ b/tests/generic/152
@@ -60,7 +60,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/153 b/tests/generic/153
index 2ddb48d7bf652fe2c9bf501dee722b3a931afb3a..fb5d55238d0ce7357e33d049c4aa93c1bdfd4c92 100755 (executable)
--- a/tests/generic/153
+++ b/tests/generic/153
@@ -60,7 +60,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/154 b/tests/generic/154
index f270ccb4233d5de103946045c61b42db463dc5b3..9daee70301f4347ad1fba8225c9bb5602325335a 100755 (executable)
--- a/tests/generic/154
+++ b/tests/generic/154
@@ -59,7 +59,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 free_blocks0=$(stat -f $testdir -c '%f')
 blks=2000
 margin='15%'
 free_blocks0=$(stat -f $testdir -c '%f')

diff --git a/tests/generic/155 b/tests/generic/155
index 23057c08625298923e33f54ca154dec75d493097..9eead248cbb8fde9164593eaddb6a46a07401613 100755 (executable)
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -64,7 +64,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/156 b/tests/generic/156
index e062b56a36d38d49157499d2c3921a48e69e785b..a81b91a3bb1820089b08383236b9cc4078deb589 100755 (executable)
--- a/tests/generic/156
+++ b/tests/generic/156
@@ -67,7 +67,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin='15%'
 sz=$((blksz * blks))
 blks=2000
 margin='15%'
 sz=$((blksz * blks))

diff --git a/tests/generic/157 b/tests/generic/157
index 9284c55c707aa80d9685d411acef066c7f6b300f..722dc22233190a0bb75b8a23450f32d88b4e68c2 100755 (executable)
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -60,7 +60,7 @@ testdir2=$SCRATCH_MNT/test-$seq
 mkdir $testdir2
 
 echo "Create the original files"
 mkdir $testdir2
 
 echo "Create the original files"

-blksz="$(get_block_size $testdir1)"
+blksz="$(_get_block_size $testdir1)"

 blks=1000
 margin='7%'
 sz=$((blksz * blks))
 blks=1000
 margin='7%'
 sz=$((blksz * blks))

diff --git a/tests/generic/158 b/tests/generic/158
index 2d34df9500229208362de0a553e7bdcf5dc4e9e2..c4f8bb8eb4eb576e198376a105568e74cc892681 100755 (executable)
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -60,7 +60,7 @@ testdir2=$SCRATCH_MNT/test-$seq
 mkdir $testdir2
 
 echo "Create the original files"
 mkdir $testdir2
 
 echo "Create the original files"

-blksz="$(get_block_size $testdir1)"
+blksz="$(_get_block_size $testdir1)"

 blks=1000
 margin='7%'
 sz=$((blksz * blks))
 blks=1000
 margin='7%'
 sz=$((blksz * blks))

diff --git a/tests/generic/159 b/tests/generic/159
index 6f75b73ec03caa4a378f280b1a6d8333ca7e178a..7e52d5cb0658fb3f1e3fc9ce6c331535f8b61f3b 100755 (executable)
--- a/tests/generic/159
+++ b/tests/generic/159
@@ -54,7 +54,7 @@ rm -rf $testdir1
 mkdir $testdir1
 
 echo "Create the original files"
 mkdir $testdir1
 
 echo "Create the original files"

-blksz="$(get_block_size $testdir1)"
+blksz="$(_get_block_size $testdir1)"

 blks=1000
 margin='7%'
 sz=$((blksz * blks))
 blks=1000
 margin='7%'
 sz=$((blksz * blks))

diff --git a/tests/generic/160 b/tests/generic/160
index 066bf5eac1195d9bb836c0087d81ce361ba13487..409b15ec4128d802c78d228c65cac52204ff42da 100755 (executable)
--- a/tests/generic/160
+++ b/tests/generic/160
@@ -54,7 +54,7 @@ rm -rf $testdir1
 mkdir $testdir1
 
 echo "Create the original files"
 mkdir $testdir1
 
 echo "Create the original files"

-blksz="$(get_block_size $testdir1)"
+blksz="$(_get_block_size $testdir1)"

 blks=1000
 margin='7%'
 sz=$((blksz * blks))
 blks=1000
 margin='7%'
 sz=$((blksz * blks))

diff --git a/tests/generic/171 b/tests/generic/171
index 916d66354d79f9d62dbd4927f1f4c66a89c0a416..0942ac34c8214833defae395321c6a5315728747 100755 (executable)
--- a/tests/generic/171
+++ b/tests/generic/171
@@ -58,7 +58,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Reformat with appropriate size"
 mkdir $testdir
 
 echo "Reformat with appropriate size"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))
 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))

diff --git a/tests/generic/172 b/tests/generic/172
index 2727836b82dd3f54111ef011a109270887f39b39..d8ab8820b92e5571bc4ff68f4babc4f33b233249 100755 (executable)
--- a/tests/generic/172
+++ b/tests/generic/172
@@ -58,7 +58,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Reformat with appropriate size"
 mkdir $testdir
 
 echo "Reformat with appropriate size"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 umount $SCRATCH_MNT
 
 file_size=$((168 * 1024 * 1024))
 umount $SCRATCH_MNT
 
 file_size=$((168 * 1024 * 1024))

diff --git a/tests/generic/173 b/tests/generic/173
index a414c8e1a2261caba3351f9526b851eb1e96f6e0..ad4e5dad2662fe4184f4557dd7f8775a976f10f8 100755 (executable)
--- a/tests/generic/173
+++ b/tests/generic/173
@@ -58,7 +58,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Reformat with appropriate size"
 mkdir $testdir
 
 echo "Reformat with appropriate size"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))
 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))

diff --git a/tests/generic/174 b/tests/generic/174
index 1eeff690b2aeef0fcea2dcb15e3bc95bf78ac69f..d230577a08f25df8a37191616259b911181bc79a 100755 (executable)
--- a/tests/generic/174
+++ b/tests/generic/174
@@ -59,7 +59,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Reformat with appropriate size"
 mkdir $testdir
 
 echo "Reformat with appropriate size"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))
 nr_blks=10240
 umount $SCRATCH_MNT
 sz_bytes=$((nr_blks * 8 * blksz))

diff --git a/tests/generic/175 b/tests/generic/175
index f4f19f8475c94aa1ac050f7dd612af9a4201679e..df25f0a6a1730cfbf29a4241aa5dd65a9dff578c 100755 (executable)
--- a/tests/generic/175
+++ b/tests/generic/175
@@ -56,7 +56,7 @@ testdir="$SCRATCH_MNT/test-$seq"
 mkdir "$testdir"
 
 echo "Create a one block file"
 mkdir "$testdir"
 
 echo "Create a one block file"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 _pwrite_byte 0x61 0 $blksz "$testdir/file1" >> "$seqres.full"
 
 fnr=19
 _pwrite_byte 0x61 0 $blksz "$testdir/file1" >> "$seqres.full"
 
 fnr=19

diff --git a/tests/generic/176 b/tests/generic/176
index 76e923a3c9d1a170d00dd139407bee224f9ab174..3e61b68c9be178a1397effd83b25e37c19ee87e3 100755 (executable)
--- a/tests/generic/176
+++ b/tests/generic/176
@@ -60,7 +60,7 @@ mkdir "$testdir"
 # 2^17 blocks... that should be plenty for anyone.
 fnr=20
 free_blocks=$(stat -f -c '%a' "$testdir")
 # 2^17 blocks... that should be plenty for anyone.
 fnr=20
 free_blocks=$(stat -f -c '%a' "$testdir")

-blksz=$(get_block_size "$testdir")
+blksz=$(_get_block_size "$testdir")

 space_avail=$((free_blocks * blksz))
 calc_space() {
        blocks_needed=$(( 2 ** (fnr + 1) ))
 space_avail=$((free_blocks * blksz))
 calc_space() {
        blocks_needed=$(( 2 ** (fnr + 1) ))

diff --git a/tests/generic/205 b/tests/generic/205
index cfda8c37fc9e5703475d913448bfce111f5bf20b..65e345a8bdaadd8a8fc01025ccb8c38f409f45b6 100755 (executable)
--- a/tests/generic/205
+++ b/tests/generic/205
@@ -60,7 +60,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/206 b/tests/generic/206
index 909956fe1d1c085a02f3532b3b70a12ca2f911bd..181650264cbefb397aeace8ddb50a5e77892d883 100755 (executable)
--- a/tests/generic/206
+++ b/tests/generic/206
@@ -61,7 +61,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/216 b/tests/generic/216
index d9b868a0fa2380557f2a10d9839d0c787a161f40..d85c1e6554a2fbce861969dba937d856c8223056 100755 (executable)
--- a/tests/generic/216
+++ b/tests/generic/216
@@ -61,7 +61,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/217 b/tests/generic/217
index 65113d9acaff567f44f3a99d9c465484d77a8f55..19d6f007e8880d87d4e85ba7ebd7504abe82b036 100755 (executable)
--- a/tests/generic/217
+++ b/tests/generic/217
@@ -62,7 +62,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/218 b/tests/generic/218
index 21029efb4978b06f2c16ab5905c3a5388301df21..f69c02a610facbb8b1f523b3b455a040fa4b0525 100755 (executable)
--- a/tests/generic/218
+++ b/tests/generic/218
@@ -61,7 +61,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/220 b/tests/generic/220
index c54bf06d3d6f81d16f9fe8318b44c195381e194f..0678b5f43ef0e0570a91d3ce64afeb16bdef611b 100755 (executable)
--- a/tests/generic/220
+++ b/tests/generic/220
@@ -62,7 +62,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/222 b/tests/generic/222
index d7ee57ea303196ecb000d91a47d1b41a55b04881..24c54bb7a7303d2edc5d1b33117d3d024012c1d9 100755 (executable)
--- a/tests/generic/222
+++ b/tests/generic/222
@@ -61,7 +61,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/227 b/tests/generic/227
index fa6a33ed2ef1b8f168221aecda9113135af7f370..eb79bac54fe60681c3e406ce88c541d319ea8107 100755 (executable)
--- a/tests/generic/227
+++ b/tests/generic/227
@@ -62,7 +62,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 echo "Create the original files"

diff --git a/tests/generic/229 b/tests/generic/229
index 3e2c6f4c84882b82dc86b5315ea825ecfdde8160..332e69c66c26ba96914ef68f200ce1c30e0b02f9 100755 (executable)
--- a/tests/generic/229
+++ b/tests/generic/229
@@ -61,7 +61,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 runtest() {
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 runtest() {

diff --git a/tests/generic/238 b/tests/generic/238
index a2f44e8f61ae3c862077fd02ab9a2b681b160c20..df13c63a02ce476129ed1ced08870ddcd2d23027 100755 (executable)
--- a/tests/generic/238
+++ b/tests/generic/238
@@ -62,7 +62,7 @@ _scratch_mount >> $seqres.full 2>&1
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 runtest() {
 test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
 
 runtest() {

diff --git a/tests/generic/240 b/tests/generic/240
index e32f15ae3435966fc40d32960a720f92cfb56fc1..7fbd4b3cc00a4c3a3331c2bd09efa5cf4ab90c63 100755 (executable)
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -62,7 +62,7 @@ rm -f $seqres.full
 rm -f $TEST_DIR/aiodio_sparse
 
 logical_block_size=`_min_dio_alignment $TEST_DEV`
 rm -f $TEST_DIR/aiodio_sparse
 
 logical_block_size=`_min_dio_alignment $TEST_DEV`

-fs_block_size=`get_block_size $TEST_DIR`
+fs_block_size=`_get_block_size $TEST_DIR`

 file_size=$((8 * $fs_block_size))
 
 if [ $fs_block_size -le $logical_block_size ]; then
 file_size=$((8 * $fs_block_size))
 
 if [ $fs_block_size -le $logical_block_size ]; then

diff --git a/tests/generic/242 b/tests/generic/242
index 2b070673664eb0e927952e93e35d123144b810ac..1bfeb773357c70b407f2c316229902114dd020a8 100755 (executable)
--- a/tests/generic/242
+++ b/tests/generic/242
@@ -65,7 +65,7 @@ bufnr=1280
 bufsize=$((blksz * bufnr))
 
 free_blocks=$(stat -f -c '%a' $testdir)
 bufsize=$((blksz * bufnr))
 
 free_blocks=$(stat -f -c '%a' $testdir)

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 space_needed=$(((filesize * 3) * 5 / 4))
 space_avail=$((free_blocks * real_blksz))
 test $space_needed -gt $space_avail && _notrun "Not enough space. $space_avail < $space_needed"
 space_needed=$(((filesize * 3) * 5 / 4))
 space_avail=$((free_blocks * real_blksz))
 test $space_needed -gt $space_avail && _notrun "Not enough space. $space_avail < $space_needed"

diff --git a/tests/generic/243 b/tests/generic/243
index 1ba3e8ac09e5b4e41cba7d55bcd6e3801257bdf2..59ae6e86a8259e715cd7263c7d878d288378ce65 100755 (executable)
--- a/tests/generic/243
+++ b/tests/generic/243
@@ -66,7 +66,7 @@ bufnr=1280
 bufsize=$((blksz * bufnr))
 
 free_blocks=$(stat -f -c '%a' $testdir)
 bufsize=$((blksz * bufnr))
 
 free_blocks=$(stat -f -c '%a' $testdir)

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 space_needed=$(((filesize * 3) * 5 / 4))
 space_avail=$((free_blocks * real_blksz))
 test $space_needed -gt $space_avail && _notrun "Not enough space. $space_avail < $space_needed"
 space_needed=$(((filesize * 3) * 5 / 4))
 space_avail=$((free_blocks * real_blksz))
 test $space_needed -gt $space_avail && _notrun "Not enough space. $space_avail < $space_needed"

diff --git a/tests/generic/256 b/tests/generic/256
index 63f2d4f4108efe39072984715e8e2f1711b00a6b..3b00d56cc194bff202f994a3dd0836d01ae2710e 100755 (executable)
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -117,7 +117,7 @@ _scratch_mount
 # Test must be able to write files with non-root permissions
 chmod 777 $SCRATCH_MNT
 
 # Test must be able to write files with non-root permissions
 chmod 777 $SCRATCH_MNT
 

-block_size=`get_block_size $SCRATCH_MNT`
+block_size=`_get_block_size $SCRATCH_MNT`

 _test_full_fs_punch $(( $block_size * 2 )) $block_size 500 $SCRATCH_MNT/252.$$ $block_size
 
 status=0 ; exit
 _test_full_fs_punch $(( $block_size * 2 )) $block_size 500 $SCRATCH_MNT/252.$$ $block_size
 
 status=0 ; exit

diff --git a/tests/generic/273 b/tests/generic/273
index d90212e1d265839cd1138465d5195113de3a3f59..578b1dab7cc65fefe7177809893d1904ec547fbf 100755 (executable)
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -106,7 +106,7 @@ _do_workload()
 {
        _pids=""
        _pid=1
 {
        _pids=""
        _pid=1

-       block_size=$(get_block_size $SCRATCH_MNT)
+       block_size=$(_get_block_size $SCRATCH_MNT)

        
        _threads_set
        _file_create $block_size
        
        _threads_set
        _file_create $block_size

diff --git a/tests/generic/296 b/tests/generic/296
index 919900656c7d0298535f3d323eee1fa203c9e736..31c8e8913e996a53df430836c78f81bc554ae625 100755 (executable)
--- a/tests/generic/296
+++ b/tests/generic/296
@@ -61,7 +61,7 @@ filesize=$((blksz * nr))
 bufnr=16
 bufsize=$((blksz * bufnr))
 
 bufnr=16
 bufsize=$((blksz * bufnr))
 

-real_blksz=$(get_block_size "$testdir")
+real_blksz=$(_get_block_size "$testdir")

 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 
 echo "Create the original files"
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 
 echo "Create the original files"

diff --git a/tests/generic/297 b/tests/generic/297
index 8dfc34242beb7cb43b1ae5b9aaea49cc76a60c09..f7eb37b98a401345aca31d995e3a3ac9d2a3f348 100755 (executable)
--- a/tests/generic/297
+++ b/tests/generic/297
@@ -59,7 +59,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create a one block file"
 mkdir $testdir
 
 echo "Create a one block file"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 _pwrite_byte 0x61 0 $blksz $testdir/file1 >> $seqres.full
 
 fnr=26         # 2^26 reflink extents should be enough to find a slow op?
 _pwrite_byte 0x61 0 $blksz $testdir/file1 >> $seqres.full
 
 fnr=26         # 2^26 reflink extents should be enough to find a slow op?

diff --git a/tests/generic/298 b/tests/generic/298
index 3f6446c18e6e1093090761ee7efd73b6a6453193..b518da1db78be94905e88db725c52ec748fd87d5 100755 (executable)
--- a/tests/generic/298
+++ b/tests/generic/298
@@ -59,7 +59,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create a one block file"
 mkdir $testdir
 
 echo "Create a one block file"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 _pwrite_byte 0x61 0 $blksz $testdir/file1 >> $seqres.full
 
 fnr=26         # 2^26 reflink extents should be enough to find a slow op?
 _pwrite_byte 0x61 0 $blksz $testdir/file1 >> $seqres.full
 
 fnr=26         # 2^26 reflink extents should be enough to find a slow op?

diff --git a/tests/generic/301 b/tests/generic/301
index a196cd416addc0e477f559e45b45368638f9e9e3..67b1a0cf3e03a7a7ffcdf59e765d3b520ff694f4 100755 (executable)
--- a/tests/generic/301
+++ b/tests/generic/301
@@ -65,7 +65,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/generic/302 b/tests/generic/302
index b2298cb31a0e3a0783767abd3437368a53ff7d97..3834f98f3fbfb37e3cdb248789494c1ed9c681e9 100755 (executable)
--- a/tests/generic/302
+++ b/tests/generic/302
@@ -66,7 +66,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/generic/308 b/tests/generic/308
index e639da1fc8f1df7e6c7cfa937dfbbe8e98daa240..afc9bf5c7cf107aab2e6a9a1fff7e1c42fad1fab 100755 (executable)
--- a/tests/generic/308
+++ b/tests/generic/308
@@ -49,7 +49,7 @@ _require_test
 rm -f $seqres.full
 echo "Silence is golden"
 
 rm -f $seqres.full
 echo "Silence is golden"
 

-block_size=`get_block_size $TEST_DIR`
+block_size=`_get_block_size $TEST_DIR`

 
 # On unpatched ext4, if an extent exists which includes the block right
 # before the maximum file offset, and the block for the maximum file offset
 
 # On unpatched ext4, if an extent exists which includes the block right
 # before the maximum file offset, and the block for the maximum file offset

diff --git a/tests/generic/391 b/tests/generic/391
index 5db8587535a20c363c80463f038ad94229fe06b4..6da178145ee76123571114a5af7c6be47c7a6c9d 100755 (executable)
--- a/tests/generic/391
+++ b/tests/generic/391
@@ -54,7 +54,7 @@ _require_test
 _require_xfs_io_command "falloc"
 _require_test_program "dio-interleaved"
 
 _require_xfs_io_command "falloc"
 _require_test_program "dio-interleaved"
 

-extent_size="$(($(get_block_size "$TEST_DIR") * 2))"
+extent_size="$(($(_get_block_size "$TEST_DIR") * 2))"

 num_extents=1024
 testfile="$TEST_DIR/$$-testfile"
 
 num_extents=1024
 testfile="$TEST_DIR/$$-testfile"
 

diff --git a/tests/shared/298 b/tests/shared/298
index 2ed7eabb4dbac129eb2846c1a1ae19340ed18314..0a11300b9d25449ba61429e0c7ba23180ee43c71 100755 (executable)
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -165,7 +165,7 @@ echo "done."
 
 echo -n "Comparing holes to the reported space from FS..."
 # Get block size
 
 echo -n "Comparing holes to the reported space from FS..."
 # Get block size

-block_size=$(get_block_size $loop_mnt/)
+block_size=$(_get_block_size $loop_mnt/)

 sectors_per_block=`expr $block_size / 512`
 
 # Obtain free space from filesystem
 sectors_per_block=`expr $block_size / 512`
 
 # Obtain free space from filesystem

diff --git a/tests/xfs/127 b/tests/xfs/127
index 8212ec39113a445c3d03739ef5ea15341af952f5..9df99904a70a6db9e88c8588df3d1262595a0dd9 100755 (executable)
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -55,7 +55,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file and reflink to copy1, copy2"
 mkdir $testdir
 
 echo "Create the original file and reflink to copy1, copy2"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 _pwrite_byte 0x61 0 $((blksz * 14 + 71)) $testdir/original >> $seqres.full
 _cp_reflink $testdir/original $testdir/copy1
 _cp_reflink $testdir/copy1 $testdir/copy2
 _pwrite_byte 0x61 0 $((blksz * 14 + 71)) $testdir/original >> $seqres.full
 _cp_reflink $testdir/original $testdir/copy1
 _cp_reflink $testdir/copy1 $testdir/copy2

diff --git a/tests/xfs/128 b/tests/xfs/128
index 6bb6282f0b1a23a766cbbf00a54ae426b878e29b..8e29b8dd1781cbb5fd1865bc5158aa6baf014fd7 100755 (executable)
--- a/tests/xfs/128
+++ b/tests/xfs/128
@@ -60,7 +60,7 @@ echo "Create the original file and reflink to file2, file3"
 blks=2000
 margin=160
 blksz=65536
 blks=2000
 margin=160
 blksz=65536

-real_blksz="$(get_block_size $testdir)"
+real_blksz="$(_get_block_size $testdir)"

 blksz_factor=$((blksz / real_blksz))
 _pwrite_byte 0x61 0 $((blks * blksz)) $testdir/file1 >> $seqres.full
 _cp_reflink $testdir/file1 $testdir/file2
 blksz_factor=$((blksz / real_blksz))
 _pwrite_byte 0x61 0 $((blks * blksz)) $testdir/file1 >> $seqres.full
 _cp_reflink $testdir/file1 $testdir/file2

diff --git a/tests/xfs/129 b/tests/xfs/129
index 10880e52aa8fdf860e87cb1cba89c5eea959264a..687d6274928356b8c0b45df4129b4c71a5c7c4ac 100755 (executable)
--- a/tests/xfs/129
+++ b/tests/xfs/129
@@ -59,7 +59,7 @@ mkdir $testdir
 metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"
 metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((4 * blksz / 12))
 _pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
 
 nr_blks=$((4 * blksz / 12))
 _pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
 

diff --git a/tests/xfs/132 b/tests/xfs/132
index ac8dc25f576801a0763f7fd7e253c9294dc87d83..178e26850a53a871e2343609c421a34f7a31e1df 100755 (executable)
--- a/tests/xfs/132
+++ b/tests/xfs/132
@@ -72,7 +72,7 @@ rm -rf $testdir
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 blks=2000
 margin=100
 sz=$((blksz * blks))
 blks=2000
 margin=100
 sz=$((blksz * blks))

diff --git a/tests/xfs/139 b/tests/xfs/139
index b62ef1b58e1adbf130807b40af055e5bcbc31860..4ee7ea2a3ab76bba371c17569a7c6ee39574773c 100755 (executable)
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -54,7 +54,7 @@ _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 
 echo "Create the original files"
 sz=$((48 * 1048576))
 
 echo "Create the original files"
 sz=$((48 * 1048576))

diff --git a/tests/xfs/140 b/tests/xfs/140
index a87357b0ecf52fd55bd92db1e2e7d798774c8b51..74d8f12e59fe8770a6f69ede20a1a7d73c9603d3 100755 (executable)
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -54,7 +54,7 @@ _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir

-blksz=$(get_block_size $testdir)
+blksz=$(_get_block_size $testdir)

 
 echo "Create the original files"
 sz=$((48 * 1048576))
 
 echo "Create the original files"
 sz=$((48 * 1048576))

diff --git a/tests/xfs/169 b/tests/xfs/169
index acd4b89613157aadb34a56183c6e87e4bde550fd..96f7c5e6cbdf822b6e94a488ba3b3ca8b402943f 100755 (executable)
--- a/tests/xfs/169
+++ b/tests/xfs/169
@@ -57,7 +57,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((8 * blksz / 12))
 
 for i in 1 2 x; do
 nr_blks=$((8 * blksz / 12))
 
 for i in 1 2 x; do

diff --git a/tests/xfs/180 b/tests/xfs/180
index e2d336993c4230e3053ffc8b979fed9385f3c595..ce2ac2683fab7d779e0680f349e9fbee9a4dfba0 100755 (executable)
--- a/tests/xfs/180
+++ b/tests/xfs/180
@@ -68,7 +68,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/182 b/tests/xfs/182
index f48a8c74802187dc83ebc1b17efe6aea931be63c..4413c7d3b007f1b86d4cdb84d80a68e379e28493 100755 (executable)
--- a/tests/xfs/182
+++ b/tests/xfs/182
@@ -69,7 +69,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/184 b/tests/xfs/184
index 08607019f67a450d88af89ef376c3297646cf8c3..54eb11519a908d53dc1496dbfcce52c39d939a4c 100755 (executable)
--- a/tests/xfs/184
+++ b/tests/xfs/184
@@ -69,7 +69,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/192 b/tests/xfs/192
index e56c8605ae56877251730f45bbb4a703a9d31a91..d8bdb25e32a9c1ead324c2948103f3648e7aaa5c 100755 (executable)
--- a/tests/xfs/192
+++ b/tests/xfs/192
@@ -70,7 +70,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/193 b/tests/xfs/193
index 2cd8880947941c3a1bd61de9774aa63fd432ca00..76cb14339db2bcde055f4ae3519ca2de094b60f5 100755 (executable)
--- a/tests/xfs/193
+++ b/tests/xfs/193
@@ -67,7 +67,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/198 b/tests/xfs/198
index f55ed23689586e786bf594eb5576c42b474b6eaa..d185ca258af7bddadb5a60df9418141f41c6eef3 100755 (executable)
--- a/tests/xfs/198
+++ b/tests/xfs/198
@@ -68,7 +68,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/200 b/tests/xfs/200
index d4363a4264d57fe6e62c3f3e370cf086752270f6..e70fda3db2762d3548b74c5d39939f3c4e344c86 100755 (executable)
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -71,7 +71,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/204 b/tests/xfs/204
index 3dbaf95d5d164bb5e20894c574447a89f1bce11b..c0b69cf7ffa95a1a1ad67a668381b52593a5abe8 100755 (executable)
--- a/tests/xfs/204
+++ b/tests/xfs/204
@@ -72,7 +72,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/208 b/tests/xfs/208
index e64106a9b99c1bbd171efcaf528b0a067ab75724..62192cb1b96b7496a0cf9dfb391575c64b9ffe0b 100755 (executable)
--- a/tests/xfs/208
+++ b/tests/xfs/208
@@ -71,7 +71,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/211 b/tests/xfs/211
index 68abaf7e397860462541e46dc236276d2ac9fdf4..0d150f1d35b3ebee4f1513e80ac5c46ee6ebb008 100755 (executable)
--- a/tests/xfs/211
+++ b/tests/xfs/211
@@ -69,7 +69,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 2 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 2 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/215 b/tests/xfs/215
index c4bb32204b4217571ac208f13b82ac12d0117ca1..c2b9c0edad4a3c48c79026020919217199016499 100755 (executable)
--- a/tests/xfs/215
+++ b/tests/xfs/215
@@ -66,7 +66,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_unwritten $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_unwritten $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/218 b/tests/xfs/218
index 7fcca82e3df871a69021619edf07e29fc5f3e421..31cac4462d010d7b2448cd3a5097c59356bd51e1 100755 (executable)
--- a/tests/xfs/218
+++ b/tests/xfs/218
@@ -65,7 +65,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_unwritten $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_unwritten $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/219 b/tests/xfs/219
index f02cc2d259f5aaab9da7a44ad4920a4fe553a724..2a8d966f718c9a488161df824d5e7d22aa4e59c3 100755 (executable)
--- a/tests/xfs/219
+++ b/tests/xfs/219
@@ -66,7 +66,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/221 b/tests/xfs/221
index 1dfcd9698c02ad9ef1c1e8723b7e37e3394e5741..405d2d5b0d1d6487be8930af04cac33c6f0daf0f 100755 (executable)
--- a/tests/xfs/221
+++ b/tests/xfs/221
@@ -65,7 +65,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/223 b/tests/xfs/223
index d93b31121c660435534af9fa94d36ba73a4e3ba7..66548727ee7f8abba07154c92394d16d4ab84a88 100755 (executable)
--- a/tests/xfs/223
+++ b/tests/xfs/223
@@ -67,7 +67,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/224 b/tests/xfs/224
index 7a59dbacaf5182d4c82343784d6a728a9df4c118..376abe164e23a164567668802aefd8bf81e278ab 100755 (executable)
--- a/tests/xfs/224
+++ b/tests/xfs/224
@@ -66,7 +66,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_holes $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/225 b/tests/xfs/225
index 596cdb86f01994ae678ca34c07b0fa933709cc8b..5864677366f27fe1be46369614dd3d5c972dc02c 100755 (executable)
--- a/tests/xfs/225
+++ b/tests/xfs/225
@@ -66,7 +66,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_regular $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_regular $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/226 b/tests/xfs/226
index d3a0dc0b4a9ca7e03aeda439d08cf5880dd08334..44605b1e731498323713b885c0608129d275f038 100755 (executable)
--- a/tests/xfs/226
+++ b/tests/xfs/226
@@ -65,7 +65,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_regular $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_regular $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/228 b/tests/xfs/228
index 994f5014610fe55d5bc79dca42a24fa283145c04..9d8e9a907b3c16e68e2d655467e1bab8bc87e4bb 100755 (executable)
--- a/tests/xfs/228
+++ b/tests/xfs/228
@@ -72,7 +72,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_rainbow $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_rainbow $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/230 b/tests/xfs/230
index f4b9f157b165a51af89d045d593a17ffd197e0f6..e42013f9e435fc17b41312cc16fb2d9a0e03f31b 100755 (executable)
--- a/tests/xfs/230
+++ b/tests/xfs/230
@@ -72,7 +72,7 @@ echo "Create the original files"
 blksz=65536
 nr=64
 filesize=$((blksz * nr))
 blksz=65536
 nr=64
 filesize=$((blksz * nr))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_rainbow $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full
 internal_blks=$((filesize / real_blksz))
 $XFS_IO_PROG -c "cowextsize $((blksz * 16))" $testdir >> $seqres.full
 _weave_reflink_rainbow $blksz $nr $testdir/file1 $testdir/file3 >> $seqres.full

diff --git a/tests/xfs/231 b/tests/xfs/231
index 54fc46da1498f6f42d6cbd489096b97a2379ff76..f0b64c0d075217a0c8db7e7fbcb6ad44917c5243 100755 (executable)
--- a/tests/xfs/231
+++ b/tests/xfs/231
@@ -72,7 +72,7 @@ bufnr=2
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/232 b/tests/xfs/232
index 0ffa19897f781f59604d0ca25efded67ea894564..6b74997aa65738319d4e2361cc9deb970d06649e 100755 (executable)
--- a/tests/xfs/232
+++ b/tests/xfs/232
@@ -73,7 +73,7 @@ bufnr=2
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/233 b/tests/xfs/233
index a0c1612995a3b30f5ba0df4bac0de97e0d94c602..e61c444df091833a9be9e025d2778d171f3029da 100755 (executable)
--- a/tests/xfs/233
+++ b/tests/xfs/233
@@ -53,7 +53,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original files"
 mkdir $testdir
 
 echo "Create the original files"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 _pwrite_byte 0x61 0 $((blksz * 14 + 71)) $testdir/original >> $seqres.full
 cp -p $testdir/original $testdir/copy1
 cp -p $testdir/copy1 $testdir/copy2
 _pwrite_byte 0x61 0 $((blksz * 14 + 71)) $testdir/original >> $seqres.full
 cp -p $testdir/original $testdir/copy1
 cp -p $testdir/copy1 $testdir/copy2

diff --git a/tests/xfs/234 b/tests/xfs/234
index 9a60ec6f34d5d87f410ac2d35ac87830602872e5..3480758289475c5a3b0786e0ee95008e48a2bef3 100755 (executable)
--- a/tests/xfs/234
+++ b/tests/xfs/234
@@ -59,7 +59,7 @@ mkdir $testdir
 metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"
 metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((4 * blksz / 12))
 _pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
 sync
 nr_blks=$((4 * blksz / 12))
 _pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
 sync

diff --git a/tests/xfs/236 b/tests/xfs/236
index e5840cbd8a35ea2a1aa323c26179ae13d2f64f97..3ce4de81189c170b24da9846462a3c79f3a71dcf 100755 (executable)
--- a/tests/xfs/236
+++ b/tests/xfs/236
@@ -57,7 +57,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((8 * blksz / 12))
 
 for i in 1 2 x; do
 nr_blks=$((8 * blksz / 12))
 
 for i in 1 2 x; do

diff --git a/tests/xfs/265 b/tests/xfs/265
index c8fb527c4de64fd5fcd3bd902d9baefbc0f3ed60..3dfeb7047d3ea8d37f1ece88e0fc5913b958eabf 100755 (executable)
--- a/tests/xfs/265
+++ b/tests/xfs/265
@@ -59,7 +59,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((2 * blksz / 12))
 
 for i in 1 2 x; do
 nr_blks=$((2 * blksz / 12))
 
 for i in 1 2 x; do

diff --git a/tests/xfs/309 b/tests/xfs/309
index 38c04528b0d21497a8941427f0285520cacf470f..0dd2dcf9bab9b9ad8b7a36ac7e3169a1a19fc407 100755 (executable)
--- a/tests/xfs/309
+++ b/tests/xfs/309
@@ -59,7 +59,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 nr_blks=$((2 * blksz / 12))
 
 for i in 1 2 x; do
 nr_blks=$((2 * blksz / 12))
 
 for i in 1 2 x; do

diff --git a/tests/xfs/310 b/tests/xfs/310
index cce21be0a019d97655174267d81dc879605e9a63..c78f6f11ea70c131c1a770a3351061a363207b44 100755 (executable)
--- a/tests/xfs/310
+++ b/tests/xfs/310
@@ -58,7 +58,7 @@ _scratch_mkfs >/dev/null 2>&1
 _scratch_mount >> $seqres.full
 
 testdir=$SCRATCH_MNT/test-$seq
 _scratch_mount >> $seqres.full
 
 testdir=$SCRATCH_MNT/test-$seq

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 umount $SCRATCH_MNT
 
 
 umount $SCRATCH_MNT
 


@@ -72,7 +72,7 @@ xfs_info $SCRATCH_MNT >> $seqres.full
 
 echo "Create the original file blocks"
 mkdir $testdir
 
 echo "Create the original file blocks"
 mkdir $testdir

-blksz="$(get_block_size $testdir)"
+blksz="$(_get_block_size $testdir)"

 $XFS_IO_PROG -f -c "falloc 0 $((nr_blks * blksz))" $testdir/file1 >> $seqres.full
 
 echo "Check extent count"
 $XFS_IO_PROG -f -c "falloc 0 $((nr_blks * blksz))" $testdir/file1 >> $seqres.full
 
 echo "Check extent count"

diff --git a/tests/xfs/328 b/tests/xfs/328
index 851845639db4a1bf690c8579c26eef75af394ba8..90c5f2b2a22a7a473d9d2c217985ad15cc93c1b3 100755 (executable)
--- a/tests/xfs/328
+++ b/tests/xfs/328
@@ -62,7 +62,7 @@ mkdir "$testdir"
 # 2^10 blocks... that should be plenty for anyone.
 fnr=$((12 + LOAD_FACTOR))
 free_blocks=$(stat -f -c '%a' "$testdir")
 # 2^10 blocks... that should be plenty for anyone.
 fnr=$((12 + LOAD_FACTOR))
 free_blocks=$(stat -f -c '%a' "$testdir")

-blksz=$(get_block_size $testdir)
+blksz=$(_get_block_size $testdir)

 space_avail=$((free_blocks * blksz))
 calc_space()
 {
 space_avail=$((free_blocks * blksz))
 calc_space()
 {

diff --git a/tests/xfs/331 b/tests/xfs/331
index 8a7692d80df471364478cf481fa7132b8a51efd5..8a1367c7975971331e47079e4632ea4a2a1b958c 100755 (executable)
--- a/tests/xfs/331
+++ b/tests/xfs/331
@@ -55,7 +55,7 @@ _scratch_mkfs > "$seqres.full" 2>&1
 
 echo "+ mount fs image"
 _scratch_mount
 
 echo "+ mount fs image"
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 # btree header is 56 bytes; an rmapbt record is 24 bytes; and
 # a rmapbt key/pointer pair is 44 bytes.
 
 # btree header is 56 bytes; an rmapbt record is 24 bytes; and
 # a rmapbt key/pointer pair is 44 bytes.

diff --git a/tests/xfs/335 b/tests/xfs/335
index 5e48f59b5e755e25679b518a64bd75a6075c7d8f..5afeaa8749208b5208896ea2ef7a035563742af1 100755 (executable)
--- a/tests/xfs/335
+++ b/tests/xfs/335
@@ -54,7 +54,7 @@ _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 echo "Create a three-level rtrmapbt"
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 
 echo "Create a three-level rtrmapbt"
 # inode core size is at least 176 bytes; btree header is 56 bytes;

diff --git a/tests/xfs/336 b/tests/xfs/336
index b3b703d10f419ba458f83cdcf8c1534af7b75c46..39838e9d1f7d996a28351c0e937fd70d16c9909b 100755 (executable)
--- a/tests/xfs/336
+++ b/tests/xfs/336
@@ -54,7 +54,7 @@ _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 metadump_file=$TEST_DIR/${seq}_metadump
 rm -rf $metadump_file
 
 metadump_file=$TEST_DIR/${seq}_metadump
 rm -rf $metadump_file

diff --git a/tests/xfs/337 b/tests/xfs/337
index 96a7be093b2817a9349d1f80d55c429164c65127..b61e7226d69470425b0c49cf35062db5ccda79ed 100755 (executable)
--- a/tests/xfs/337
+++ b/tests/xfs/337
@@ -57,7 +57,7 @@ cat $tmp.mkfs > "$seqres.full" 2>&1
 
 echo "+ mount fs image"
 _scratch_mount
 
 echo "+ mount fs image"
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.
 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.

diff --git a/tests/xfs/341 b/tests/xfs/341
index 8a47b77f6c7ea87cd17b1b5e1d9fffb51a8b1f83..058e98ef1573593715873cd0846aa3e2476f8bfe 100755 (executable)
--- a/tests/xfs/341
+++ b/tests/xfs/341
@@ -54,7 +54,7 @@ _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.
 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.

diff --git a/tests/xfs/342 b/tests/xfs/342
index e0d2f3334994852147d73451cb857fcb6161168a..a95b49d6fac181f869065c774f982f19a3dda2b8 100755 (executable)
--- a/tests/xfs/342
+++ b/tests/xfs/342
@@ -53,7 +53,7 @@ _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount

-blksz="$(get_block_size $SCRATCH_MNT)"
+blksz="$(_get_block_size $SCRATCH_MNT)"

 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.
 
 # inode core size is at least 176 bytes; btree header is 56 bytes;
 # rtrmap record is 32 bytes; and rtrmap key/pointer are 56 bytes.

diff --git a/tests/xfs/344 b/tests/xfs/344
index 229e22acabd906ae20ad67571e64f5998083d835..806f7abf847b1f4907e3688f5c3ac4421a02407f 100755 (executable)
--- a/tests/xfs/344
+++ b/tests/xfs/344
@@ -70,7 +70,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/345 b/tests/xfs/345
index 4e3132436fd6327e94fe6a023799081c1bdb3cd7..1684297b3b22567f7a218676dd0217611fd13724 100755 (executable)
--- a/tests/xfs/345
+++ b/tests/xfs/345
@@ -68,7 +68,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/346 b/tests/xfs/346
index 7d7075a3951ea4a1c45ae114a04dcd6bdb6bc1ec..90fe5eba54299f5e9da6af257be31af32eae4109 100755 (executable)
--- a/tests/xfs/346
+++ b/tests/xfs/346
@@ -70,7 +70,7 @@ bufnr=8
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"

diff --git a/tests/xfs/347 b/tests/xfs/347
index e4f9635a0c587bdea5441d29917942c225c7ce2f..2a13977b89d6fb131b5da4ca08af0112ce4d7c8f 100755 (executable)
--- a/tests/xfs/347
+++ b/tests/xfs/347
@@ -69,7 +69,7 @@ bufnr=8
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))

-real_blksz=$(get_block_size $testdir)
+real_blksz=$(_get_block_size $testdir)

 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"