From patchwork Thu Mar 22 02:46:56 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: 10300773 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 E285D600CC for ; Thu, 22 Mar 2018 02:47:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3D4228D31 for ; Thu, 22 Mar 2018 02:47:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7F9429018; Thu, 22 Mar 2018 02:47:03 +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 2E40628D31 for ; Thu, 22 Mar 2018 02:47:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbeCVCrC (ORCPT ); Wed, 21 Mar 2018 22:47:02 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:35940 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751716AbeCVCrC (ORCPT ); Wed, 21 Mar 2018 22:47:02 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2M2a7Dr167730; Thu, 22 Mar 2018 02:46:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2017-10-26; bh=qSAfK9uDjdm0gqN8AliskiY3jOwZSZRNhjxzuhVYkdU=; b=hm2/0BQhc97ZJdtDtgS2mdsUSgeR3KO7jPgHOpGGa4TWf302UVs5D30LMpBKvY6cFNZI FjZXi6cAUVni57GMLjzQZujtrzpn2jbCU0fQNXiUCpRQSP3GVdBPnYylCvda4V5VyrTa dmY9tTJVhIiTVFOtK0GVwjc1Ae6TrLqztxjtKT2lfFnwDAJkUwE39nZm+8TK4C7Gd4dY +LbiqobtWEUwsaCaDz+9tXoFZWOqXWw47TYdnlJIr/A0FuWGvz67XAtpk8e23tc0Eem1 501CGxZaIDlei3hFguKcBgvyI49hDlPqHpCijfptYIVEz8qu23FBjHy8Syw8B/XhHt5y Dg== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2gv3ung0k5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Mar 2018 02:46:59 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2M2kwMp001375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Mar 2018 02:46:58 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w2M2kv0k018016; Thu, 22 Mar 2018 02:46:57 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 21 Mar 2018 19:46:57 -0700 Date: Wed, 21 Mar 2018 19:46:56 -0700 From: "Darrick J. Wong" To: Eryu Guan Cc: david@fromorbit.com, fstests Subject: [PATCH] common/xfs: don't call xfs_scrub on a block device Message-ID: <20180322024656.GC4810@magnolia> References: <20180321165716.GB4818@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180321165716.GB4818@magnolia> User-Agent: Mutt/1.5.24 (2015-08-30) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8839 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