Re: [PATCH v2 3/3] common/verity: fix btrfs-corrupt-block -v option

From: Zorro Lang <zlang@redhat.com>
To: Anand Jain <anand.jain@oracle.com>
Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org,
	fdmanana@kernel.org
Subject: Re: [PATCH v2 3/3] common/verity: fix btrfs-corrupt-block -v option
Date: Wed, 24 Apr 2024 22:45:28 +0800	[thread overview]
Message-ID: <20240424144528.kd6k4uoh3wzip36c@dell-per750-06-vm-08.rhts.eng.pek2.redhat.com> (raw)
In-Reply-To: <f19513c267884160a851edf76d941df423a56fc7.1711097698.git.anand.jain@oracle.com>

On Fri, Mar 22, 2024 at 04:46:41PM +0530, Anand Jain wrote:
> The btrfs-corrupt-block -v has been replaced with --value so fix it.
> 
> _fsv_scratch_corrupt_merkle_tree() uses the btrfs-corrupt-block
> --value option, so add the "value" prerequisite in the function
> _require_fsverity_corruption.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---

It makes sense to me, as an option is changed. But I think it'll
cause _notrun on old btrfs-corrupt-block command/version. If btrfs
list feels good for that (no objection), then that's fine.

Reviewed-by: Zorro Lang <zlang@redhat.com>

>  common/verity | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/common/verity b/common/verity
> index 03d175ce1b7a..59b67e12010a 100644
> --- a/common/verity
> +++ b/common/verity
> @@ -191,7 +191,7 @@ _require_fsverity_corruption()
>  {
>  	_require_xfs_io_command "fiemap"
>  	if [ $FSTYP == "btrfs" ]; then
> -		_require_btrfs_corrupt_block
> +		_require_btrfs_corrupt_block "value"
>  	fi
>  }
>  
> @@ -402,7 +402,8 @@ _fsv_scratch_corrupt_merkle_tree()
>  			# in the default filesystem tree (-r 5) and corrupt one byte (-b 1) at
>  			# $offset (-o $offset) with the ascii representation of the byte we read
>  			# (-v $ascii)
> -			$BTRFS_CORRUPT_BLOCK_PROG -r 5 -I $ino,37,0 -v $ascii -o $offset -b 1 $SCRATCH_DEV
> +			$BTRFS_CORRUPT_BLOCK_PROG -r 5 -I $ino,37,0 \
> +			       --value $ascii --offset $offset -b 1 $SCRATCH_DEV
>  			(( offset += 1 ))
>  		done
>  		_scratch_mount
> -- 
> 2.39.3
> 
> 