From patchwork Fri Mar 23 16:54:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10305137 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 E51CA60386 for ; Fri, 23 Mar 2018 16:54:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3E1828FDC for ; Fri, 23 Mar 2018 16:54:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4CBD29094; Fri, 23 Mar 2018 16:54:37 +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 DE7DB28FDC for ; Fri, 23 Mar 2018 16:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752189AbeCWQyf (ORCPT ); Fri, 23 Mar 2018 12:54:35 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:48750 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbeCWQye (ORCPT ); Fri, 23 Mar 2018 12:54:34 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2NGsU1V144647; Fri, 23 Mar 2018 16:54:31 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=oulmGTU1/FxHo5XJO9f4zeYPeZvhjh53BngHYc6RwUQ=; b=YPbsxFciUaK5/FSsDpICVZTK6OiTD1aYHJmKYv1erNFINex7kZEBN2BQXebQ/GHogNYM RGD77IlsbGu/6rtUWToK1kbdRbjM1O+x9e7yLRzmfGRpsO7x6jPD0jfwxNNAM9zbTe5P AlMOmzRW70yj3KJQASS0ZOpyk2qSNZpND0tAO+Cn0uSwfM6uc1tJNS696+S6hyraJQ29 xQxW3PYuShuzue46gDXpUfS50V59jflmuhKPOSiuPg1ANCSnvt9HUC2AufA+f4S6hzT0 JWZfoaOamIFJQJF0otD8OHPeHRoem6NMXahZTROX0UI/0PvUYGngRbPi3hsCNh1S/xUa AQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2gw5gxg012-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Mar 2018 16:54:31 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2NGsUf2025993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Mar 2018 16:54:30 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w2NGsUm7010590; Fri, 23 Mar 2018 16:54:30 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 23 Mar 2018 09:54:29 -0700 Subject: [PATCH 1/4] common/xfs: don't call xfs_scrub on a block device From: "Darrick J. Wong" To: eguan@linux.alibaba.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Fri, 23 Mar 2018 09:54:28 -0700 Message-ID: <152182406876.14523.11145092318388572094.stgit@magnolia> In-Reply-To: <152182406249.14523.2186010254497227366.stgit@magnolia> References: <152182406249.14523.2186010254497227366.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8841 signatures=668695 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803200127 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong xfs_scrub takes an xfs mountpoint as its argument, not a block device. Therefore, fix _check_xfs_filesystem to call it correctly. 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 fstests" 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 5dbd81e..1d98ba1 100644 --- a/common/xfs +++ b/common/xfs @@ -358,7 +358,7 @@ _check_xfs_filesystem() # Run online scrub if we can. mntpt="$(_is_dev_mounted $device)" if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then - "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1 + "$XFS_SCRUB_PROG" $scrubflag -v -d -n $mntpt > $tmp.scrub 2>&1 if [ $? -ne 0 ]; then _log_err "_check_xfs_filesystem: filesystem on $device failed scrub" echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full