common/populate: use metadump v2 format by default for fs metadata snapshots

When we're snapshotting filesystem metadata after creating a populated
filesystem, force the creation of metadump v2 files by default to
exercise the new format, since xfs_metadump continues to use the v1
format unless told otherwise.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/common/populate b/common/populate
index ed3ee85ee2b6dbdccbe5fc95fb55bfb5c757224f..b9d4b0fad5999cc77cba29382467c1444c303e3f 100644 (file)
--- a/common/populate
+++ b/common/populate
@@ -55,7 +55,12 @@ __populate_fail() {
        case "$FSTYP" in
        xfs)
                _scratch_unmount
-               _scratch_xfs_metadump "$metadump" -a -o
+
+               mdargs=('-a' '-o')
+               test "$(_xfs_metadump_max_version)" -gt 1 && \
+                       mdargs+=('-v' '2')
+
+               _scratch_xfs_metadump "$metadump" "${mdargs[@]}"
                ;;
        ext4)
                _scratch_unmount
@@ -1043,8 +1048,12 @@ _scratch_populate_save_metadump()
                [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
                        logdev=$SCRATCH_LOGDEV
 
+               mdargs=('-a' '-o')
+               test "$(_xfs_metadump_max_version)" -gt 1 && \
+                       mdargs+=('-v' '2')
+
                _xfs_metadump "$metadump_file" "$SCRATCH_DEV" "$logdev" \
-                               compress -a -o
+                               compress "${mdargs[@]}"
                res=$?
                ;;
        "ext2"|"ext3"|"ext4")