diff mbox series

[07/24] xfs/{111,137}: replace open-coded calls to repair with _scratch_xfs_repair

Message ID 160013422059.2923511.8441653519485642397.stgit@magnolia (mailing list archive)
State New, archived
Headers show
Series fstests: tons of random fixes | expand

Commit Message

Darrick J. Wong Sept. 15, 2020, 1:43 a.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/111 |    2 +-
 tests/xfs/137 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Zorro Lang Sept. 16, 2020, 2:28 a.m. UTC | #1 
On Mon, Sep 14, 2020 at 06:43:40PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---

Good to me,
Reviewed-by: Zorro Lang <zlang@redhat.com>

>  tests/xfs/111 |    2 +-
>  tests/xfs/137 |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> 
> diff --git a/tests/xfs/111 b/tests/xfs/111
> index 0db33cb8..1f778966 100755
> --- a/tests/xfs/111
> +++ b/tests/xfs/111
> @@ -62,7 +62,7 @@ $XFS_FSR_PROG -g $SCRATCH_MNT | _filter_scratch
>  
>  # Fix up intentional corruption so test can pass
>  _scratch_unmount
> -$XFS_REPAIR_PROG $SCRATCH_DEV >> $seqres.full 2>&1
> +_scratch_xfs_repair >> $seqres.full 2>&1
>  
>  status=0
>  exit
> diff --git a/tests/xfs/137 b/tests/xfs/137
> index 79106c66..c10860bb 100755
> --- a/tests/xfs/137
> +++ b/tests/xfs/137
> @@ -64,11 +64,11 @@ else
>  fi
>  
>  # verify that repair detects invalid LSNs as well
> -$XFS_REPAIR_PROG -n $SCRATCH_DEV >> $seqres.full 2>&1 || \
> +_scratch_xfs_repair -n >> $seqres.full 2>&1 || \
>  	echo repair failure detected
>  
>  # repair for real so the post-test check can verify repair fixed things up
> -$XFS_REPAIR_PROG $SCRATCH_DEV >> $seqres.full 2>&1
> +_scratch_xfs_repair >> $seqres.full 2>&1
>  
>  # success, all done
>  status=0
>
Christoph Hellwig Sept. 17, 2020, 7:54 a.m. UTC | #2 
Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>
diff mbox series

Patch

diff --git a/tests/xfs/111 b/tests/xfs/111
index 0db33cb8..1f778966 100755
--- a/tests/xfs/111
+++ b/tests/xfs/111
@@ -62,7 +62,7 @@  $XFS_FSR_PROG -g $SCRATCH_MNT | _filter_scratch
 
 # Fix up intentional corruption so test can pass
 _scratch_unmount
-$XFS_REPAIR_PROG $SCRATCH_DEV >> $seqres.full 2>&1
+_scratch_xfs_repair >> $seqres.full 2>&1
 
 status=0
 exit
diff --git a/tests/xfs/137 b/tests/xfs/137
index 79106c66..c10860bb 100755
--- a/tests/xfs/137
+++ b/tests/xfs/137
@@ -64,11 +64,11 @@  else
 fi
 
 # verify that repair detects invalid LSNs as well
-$XFS_REPAIR_PROG -n $SCRATCH_DEV >> $seqres.full 2>&1 || \
+_scratch_xfs_repair -n >> $seqres.full 2>&1 || \
 	echo repair failure detected
 
 # repair for real so the post-test check can verify repair fixed things up
-$XFS_REPAIR_PROG $SCRATCH_DEV >> $seqres.full 2>&1
+_scratch_xfs_repair >> $seqres.full 2>&1
 
 # success, all done
 status=0