[PATCH 02/14] common/{fuzzy,populate}: use _scratch_xfs_mdrestore

Darrick J. Wong
2025-01-16T23:35:36Z

Port the fuzzing and populated filesystem cache code to use this helper
to pick up external log devices for the scratch filesystem.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
common/fuzzy | 2 +-
common/populate | 15 ++-------------
2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/common/fuzzy b/common/fuzzy
index 331bf5ad7bbafa..9fcaf9b6ee55a9 100644
--- a/common/fuzzy
+++ b/common/fuzzy
@@ -306,7 +306,7 @@ __scratch_xfs_fuzz_unmount()
__scratch_xfs_fuzz_mdrestore()
{
__scratch_xfs_fuzz_unmount
- _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" || \
+ _scratch_xfs_mdrestore "${POPULATE_METADUMP}" || \
_fail "${POPULATE_METADUMP}: Could not find metadump to restore?"
}

diff --git a/common/populate b/common/populate
index 4cc4415697ac78..814f28a41c9bea 100644
--- a/common/populate
+++ b/common/populate
@@ -1017,19 +1017,8 @@ _scratch_populate_restore_cached() {

case "${FSTYP}" in
"xfs")
- _xfs_mdrestore "${metadump}" "${SCRATCH_DEV}"
- res=$?
- test $res -ne 0 && return $res
-
- # Cached images should have been unmounted cleanly, so if
- # there's an external log we need to wipe it and run repair to
- # format it to match this filesystem.
- if [ -n "${SCRATCH_LOGDEV}" ]; then
- $WIPEFS_PROG -a "${SCRATCH_LOGDEV}"
- _scratch_xfs_repair
- res=$?
- fi
- return $res
+ _scratch_xfs_mdrestore "${metadump}"
+ return $?
;;
"ext2"|"ext3"|"ext4")
_ext4_mdrestore "${metadump}" "${SCRATCH_DEV}"