From patchwork Wed Dec 13 06:03:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10109263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C54160327 for ; Wed, 13 Dec 2017 06:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F63428949 for ; Wed, 13 Dec 2017 06:13:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8429928A85; Wed, 13 Dec 2017 06:13:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA97928949 for ; Wed, 13 Dec 2017 06:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750880AbdLMGNr (ORCPT ); Wed, 13 Dec 2017 01:13:47 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:58244 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750739AbdLMGNq (ORCPT ); Wed, 13 Dec 2017 01:13:46 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBD6Bv6l163414; Wed, 13 Dec 2017 06:13:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=ax8S08OkxhNPB3uT+b7d60mu6AH99GyA1mQOx6kKEVU=; b=q9KYEDG6v23YgiWvJeCzculWc19ThXOCm7D4W3wpUbFMyIGpA5PwlaOS1RxuGOkJMV3y AoAGyBWEp64Q5fqYoHhyn99GEUq0zfZC0unsteJS8PYgoyz+iKVK+N7XfqIivPIB3dpI gXSCBupadsxCOQHuZBIgdAIO8MT3xTuErAmLxt7Q7vInjGvavq0cgULaRIhSKIFc7HyG rHTyfMBxxX19ubC4jgg6FqWN4mlzdm+LwPgmrXCYOiVQdN4v1+3cL5rPUP84fdVa/Abt 0mdgjVE5TYKlMeJ4XcePuqc5dnopXbPdDID7h13FmDxT4TAXBDTCLLYXsKYd92Jjz0Ip /Q== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2etxdj06d8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 06:13:41 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBD63TfF011451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 06:03:29 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id vBD63TU9032426; Wed, 13 Dec 2017 06:03:29 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 12 Dec 2017 22:03:28 -0800 Subject: [PATCH 2/8] common/xfs: fix scrub support probing again From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 12 Dec 2017 22:03:26 -0800 Message-ID: <151314500649.18893.5124611130669609633.stgit@magnolia> In-Reply-To: <151314499003.18893.8687182548758898133.stgit@magnolia> References: <151314499003.18893.8687182548758898133.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8743 signatures=668646 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=966 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712130089 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong In the final version of the xfs_io scrub command we don't allow the probe function to have any parameters, so fix the helper to abide that. Signed-off-by: Darrick J. Wong --- common/xfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/xfs b/common/xfs index 76f94fb..f3e3764 100644 --- a/common/xfs +++ b/common/xfs @@ -314,7 +314,7 @@ _supports_xfs_scrub() # Probe for kernel support... $XFS_IO_PROG -c 'help scrub' 2>&1 | grep -q 'types are:.*probe' || return 1 - $XFS_IO_PROG -c "scrub probe 0" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1 + $XFS_IO_PROG -c "scrub probe" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1 # Scrub can't run on norecovery mounts _fs_options "$device" | grep -q "norecovery" && return 1