Re: [PATCH v2 2/2] common/rc: Update _exclude_scratch_mount_option() and _require_dm_target() for new dax option

[Ira Weiny <ira.weiny@intel.com>]

On Thu, Jul 16, 2020 at 12:23:42AM +0800, Xiao Yang wrote:
> Some tests(e.g. ext4/035) cannot include dax option(dax=inode/dax=never
> is OK) so make _exclude_scratch_mount_option() and _require_dm_target()
> check if old or new dax option is not defined in $MOUNT_OPTIONS.
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
>  common/rc | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index 8b19b3f7..7d0b8691 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -1896,7 +1896,7 @@ _require_dm_target()
>  	_require_sane_bdev_flush $SCRATCH_DEV
>  	_require_command "$DMSETUP_PROG" dmsetup
>  
> -	echo $MOUNT_OPTIONS | grep -q dax
> +	_normalize_mount_options | egrep -q "dax(=always| |$)"
>  	if [ $? -eq 0 ]; then
>  		case $target in
>  		stripe|linear|log-writes)
> @@ -3452,12 +3452,16 @@ _normalize_mount_options()
>  }
>  
>  # skip test if MOUNT_OPTIONS contains the given strings
> +# For dax option, only accept dax/dax=always mount option
>  _exclude_scratch_mount_option()
>  {
>  	local mnt_opts=$(_normalize_mount_options)
> +	local pattern=$1
> +
> +	echo "$pattern" | grep -q 'dax' && pattern="dax(=always| |$)"
>  
>  	while [ $# -gt 0 ]; do
> -		if echo $mnt_opts | grep -qw "$1"; then
> +		if echo $mnt_opts | egrep -q "$pattern"; then
>  			_notrun "mount option \"$1\" not allowed in this test"
>  		fi
>  		shift
> -- 
> 2.21.0
> 
> 
>