From: Xiao Yang <yangx.jy@cn.fujitsu.com>
Date: Wed, 19 Oct 2016 05:33:07 +0000 (+0800)
Subject: xfs: remove the device parameter from __populate_check_xfs_dir
X-Git-Tag: v2022.05.01~2319
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dc46bab289da191e21adf3009b44dbbb28f86e1a;p=users%2Fhch%2Fxfstests-dev.git

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 ebc02dd7b..85193ab8c 100755
--- 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 2412c819d..3bfafce0b 100755
--- 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 679940f1f..d3abd1925 100755
--- 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 8018a9e61..cf0d7a6d0 100755
--- 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 27ee4b39f..07ccf008b 100755
--- 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 c237f0325..84f1f1d0a 100755
--- 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 6d6e6fd2e..ec328bc2d 100755
--- 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