diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2024-02-06 18:18:56 -0800 |
|---|---|---|
| committer | Zorro Lang <zlang@kernel.org> | 2024-02-09 13:27:17 +0800 |
| commit | 5261c7b46fd46812f228565e3032ba6c1a1d3450 (patch) | |
| tree | 8f5b1b50f7125005420cf49a5757056f410d0338 | |
| parent | 1b36ec27ecfca54f15205731c8c19531a62af9e8 (diff) | |
| download | xfstests-dev-5261c7b46fd46812f228565e3032ba6c1a1d3450.tar.gz | |
xfs/336: fix omitted -a and -o in metadump call
Commit e443cadcea reworked _xfs_metadump to require that all callers
always pass the arguments they want -- no more defaulting to "-a -o".
Unfortunately, a few got missed. Fix some of them now; the rest will
get cleaned up in the next patch.
Fixes: e443cadcea ("common/xfs: Do not append -a and -o options to metadump")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
| -rwxr-xr-x | tests/xfs/284 | 4 | ||||
| -rwxr-xr-x | tests/xfs/336 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/xfs/284 b/tests/xfs/284 index 58f330035e..443c375759 100755 --- a/tests/xfs/284 +++ b/tests/xfs/284 @@ -42,12 +42,12 @@ COPY_FILE="${TEST_DIR}/${seq}_copyfile" # xfs_metadump should refuse to dump a mounted device _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount -_scratch_xfs_metadump $METADUMP_FILE 2>&1 | filter_mounted +_scratch_xfs_metadump $METADUMP_FILE -a -o 2>&1 | filter_mounted _scratch_unmount # Test restore to a mounted device # xfs_mdrestore should refuse to restore to a mounted device -_scratch_xfs_metadump $METADUMP_FILE +_scratch_xfs_metadump $METADUMP_FILE -a -o _scratch_mount _scratch_xfs_mdrestore $METADUMP_FILE 2>&1 | filter_mounted _scratch_unmount diff --git a/tests/xfs/336 b/tests/xfs/336 index 43b3790cbb..3c30f1a40b 100755 --- a/tests/xfs/336 +++ b/tests/xfs/336 @@ -62,7 +62,7 @@ _scratch_cycle_mount echo "Create metadump file" _scratch_unmount -_scratch_xfs_metadump $metadump_file -a +_scratch_xfs_metadump $metadump_file -a -o # Now restore the obfuscated one back and take a look around echo "Restore metadump" |