Linux XFS filesystem development
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: zlang@redhat.com, djwong@kernel.org
Cc: guan@eryu.me, linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 04/10] xfs/336: fix omitted -a and -o in metadump call
Date: Thu, 25 Jan 2024 11:05:01 -0800	[thread overview]
Message-ID: <170620924420.3283496.6869276450141660418.stgit@frogsfrogsfrogs> (raw)
In-Reply-To: <170620924356.3283496.1996184171093691313.stgit@frogsfrogsfrogs>

From: Darrick J. Wong <djwong@kernel.org>

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>
---
 tests/xfs/284 |    4 ++--
 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"


  parent reply	other threads:[~2024-01-25 19:05 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-25 19:04 [PATCHSET] fstests: random fixes for v2024.01.14 Darrick J. Wong
2024-01-25 19:04 ` [PATCH 01/10] generic/256: constrain runtime with TIME_FACTOR Darrick J. Wong
2024-01-26 12:32   ` Andrey Albershteyn
2024-01-26 13:30   ` Christoph Hellwig
2024-01-25 19:04 ` [PATCH 02/10] common/xfs: simplify maximum metadump format detection Darrick J. Wong
2024-01-26 13:31   ` Christoph Hellwig
2024-01-25 19:04 ` [PATCH 03/10] common/populate: always metadump full metadata blocks Darrick J. Wong
2024-01-26 13:32   ` Christoph Hellwig
2024-01-25 19:05 ` Darrick J. Wong [this message]
2024-01-26 13:33   ` [PATCH 04/10] xfs/336: fix omitted -a and -o in metadump call Christoph Hellwig
2024-01-25 19:05 ` [PATCH 05/10] common: refactor metadump v1 and v2 tests Darrick J. Wong
2024-01-26 13:34   ` Christoph Hellwig
2024-01-27  8:47   ` Zorro Lang
2024-01-27 17:22     ` Darrick J. Wong
2024-01-28 13:23       ` Zorro Lang
2024-01-30  1:32         ` Darrick J. Wong
2024-01-31 14:09           ` Zorro Lang
2024-01-31 19:24             ` Darrick J. Wong
2024-02-01  6:29               ` Zorro Lang
2024-02-02 16:47                 ` Darrick J. Wong
2024-02-04  6:59                   ` Zorro Lang
2024-02-04  7:14                     ` Zorro Lang
2024-02-05  9:37   ` Zorro Lang
2024-02-05 16:48     ` Darrick J. Wong
2024-01-25 19:05 ` [PATCH 06/10] xfs/{129,234,253,605}: disable metadump v1 testing with external devices Darrick J. Wong
2024-01-26 13:34   ` Christoph Hellwig
2024-01-25 19:05 ` [PATCH 07/10] xfs/503: test metadump obfuscation, not progressbars Darrick J. Wong
2024-01-26 13:35   ` Christoph Hellwig
2024-01-25 19:06 ` [PATCH 08/10] xfs/503: split copy and metadump into two tests Darrick J. Wong
2024-01-26 13:36   ` Christoph Hellwig
2024-01-26 16:45     ` Darrick J. Wong
2024-01-25 19:06 ` [PATCH 09/10] common/xfs: only pass -l in _xfs_mdrestore for v2 metadumps Darrick J. Wong
2024-01-26 13:36   ` Christoph Hellwig
2024-01-25 19:06 ` [PATCH 10/10] xfs/122: fix for xfs_attr_shortform removal in 6.8 Darrick J. Wong
2024-01-26 12:38   ` Andrey Albershteyn
2024-01-26 13:37   ` Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2024-02-07  2:18 [PATCHSET] fstests: random fixes for v2024.01.14 Darrick J. Wong
2024-02-07  2:18 ` [PATCH 04/10] xfs/336: fix omitted -a and -o in metadump call Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=170620924420.3283496.6869276450141660418.stgit@frogsfrogsfrogs \
    --to=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=guan@eryu.me \
    --cc=linux-xfs@vger.kernel.org \
    --cc=zlang@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox