diff mbox

common/rc: Fix _require_xfs_io_command for scrub probe

Message ID 1528087812-24372-1-git-send-email-yangx.jy@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xiao Yang June 4, 2018, 4:50 a.m. UTC
Currently, xfs_io scrub command doesn't allow the probe function
to have any parameter, so we remove the invalid parameter.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Darrick J. Wong June 4, 2018, 3:44 p.m. UTC | #1
On Mon, Jun 04, 2018 at 12:50:12PM +0800, Xiao Yang wrote:
> Currently, xfs_io scrub command doesn't allow the probe function
> to have any parameter, so we remove the invalid parameter.
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>

Bleh, sorry I've muddied the waters so much on this.  Yes, we changed
the xfs_io 'scrub probe' command not to take any parameters and forgot
to fix this. :/

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index 9273ff7..dadbed4 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2148,7 +2148,7 @@ _require_xfs_io_command()
>  		param_checked=1
>  		;;
>  	"scrub"|"repair")
> -		testio=`$XFS_IO_PROG -x -c "$command probe 0" $TEST_DIR 2>&1`
> +		testio=`$XFS_IO_PROG -x -c "$command probe" $TEST_DIR 2>&1`
>  		echo $testio | grep -q "Inappropriate ioctl" && \
>  			_notrun "xfs_io $command support is missing"
>  		;;
> -- 
> 1.8.3.1
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/common/rc b/common/rc
index 9273ff7..dadbed4 100644
--- a/common/rc
+++ b/common/rc
@@ -2148,7 +2148,7 @@  _require_xfs_io_command()
 		param_checked=1
 		;;
 	"scrub"|"repair")
-		testio=`$XFS_IO_PROG -x -c "$command probe 0" $TEST_DIR 2>&1`
+		testio=`$XFS_IO_PROG -x -c "$command probe" $TEST_DIR 2>&1`
 		echo $testio | grep -q "Inappropriate ioctl" && \
 			_notrun "xfs_io $command support is missing"
 		;;