xfs: remove the device parameter from __populate_check_xfs_dir

In commit c08ebd092 ("xfs: fix $XFS_DB_PROG usage"), the need for
callers to pass the device to populate into
__populate_check_xfs_dir() was removed. So we can now clean up all
the callers by removing the device parameter.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/xfs/099 b/tests/xfs/099
index ebc02dd7b4d4851f8ae4dd991504406f7c700cd8..85193ab8c8923d28ca34e9c31280a9f8e59ad5fa 100755 (executable)
--- a/tests/xfs/099
+++ b/tests/xfs/099
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" block
+__populate_check_xfs_dir "${inode}" block
 
 echo "+ corrupt dir"
 _scratch_xfs_db -x -c "inode ${inode}" -c 'dblock 0' -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full

diff --git a/tests/xfs/100 b/tests/xfs/100
index 2412c819deeb454892e87e0c65d72f950fc2c613..3bfafce0b45c8446926e9b42817bace5af9bd2f8 100755 (executable)
--- a/tests/xfs/100
+++ b/tests/xfs/100
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" leaf
+__populate_check_xfs_dir "${inode}" leaf
 
 echo "+ corrupt dir"
 loff=0

diff --git a/tests/xfs/101 b/tests/xfs/101
index 679940f1fe3a911e088be4e64ff8a68a35ab76a0..d3abd1925e8d28f8cac7f45ef6e31a7237cffda1 100755 (executable)
--- a/tests/xfs/101
+++ b/tests/xfs/101
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" leaf
+__populate_check_xfs_dir "${inode}" leaf
 
 echo "+ corrupt dir"
 _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full

diff --git a/tests/xfs/102 b/tests/xfs/102
index 8018a9e6189ae4c4cbf4ece12eb2adaa86fff38d..cf0d7a6d06a7a7b379825459b35af23679cea09f 100755 (executable)
--- a/tests/xfs/102
+++ b/tests/xfs/102
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node
+__populate_check_xfs_dir "${inode}" node
 
 echo "+ corrupt dir"
 loff=0

diff --git a/tests/xfs/105 b/tests/xfs/105
index 27ee4b39f98a5119fb891eee287eb478e077a511..07ccf008bf2e61cd72c06914ae492f6ac2396f44 100755 (executable)
--- a/tests/xfs/105
+++ b/tests/xfs/105
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node
+__populate_check_xfs_dir "${inode}" node
 
 echo "+ corrupt dir"
 loff="${leaf_lblk}"

diff --git a/tests/xfs/112 b/tests/xfs/112
index c237f03255c8ea67ccb252c584b92b47ea83b730..84f1f1d0ab3f407a01215fc61ea26e120cc90a31 100755 (executable)
--- a/tests/xfs/112
+++ b/tests/xfs/112
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node
+__populate_check_xfs_dir "${inode}" node
 
 echo "+ corrupt dir"
 loff="${node_lblk}"

diff --git a/tests/xfs/113 b/tests/xfs/113
index 6d6e6fd2e1184a71c81daef667b5c1ba6eee6d82..ec328bc2d58dce98e73217dabed9c2811a56a895 100755 (executable)
--- a/tests/xfs/113
+++ b/tests/xfs/113
@@ -75,7 +75,7 @@ echo "+ check fs"
 _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
 
 echo "+ check dir"
-__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" btree
+__populate_check_xfs_dir "${inode}" btree
 
 echo "+ corrupt dir"
 loff=0