From patchwork Wed Feb 7 21:19:31 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: 10206103 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 5296660327 for ; Wed, 7 Feb 2018 21:20:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40DAA29140 for ; Wed, 7 Feb 2018 21:20:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EDB129150; Wed, 7 Feb 2018 21:20:04 +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 6084729140 for ; Wed, 7 Feb 2018 21:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932279AbeBGVUA (ORCPT ); Wed, 7 Feb 2018 16:20:00 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:35372 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932245AbeBGVTh (ORCPT ); Wed, 7 Feb 2018 16:19:37 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w17LHMnh090321; Wed, 7 Feb 2018 21:19:35 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=EOAoJZiKcU6LPwkvwv75QCzu4LwQM9wIgkIuAqJrz1A=; b=Ahh9quNp3w9PSUCJItysGXlx+SFJji3I/If0i+0Lpf+LL0foJgKSIXB+oIDQADhVjSGk MTfgUsmvW5DF73UTOgPF7CasYcr+3YiDLOzNw0kvlGaANzH8m80Vmpycx5rAMyUxCa4U sq1ZBYS6a/XgPDNm7qb8wImwhMPMPEbZgMTMblB3i7G1Jv0dXF78gKiGqPtToWV3Hvi4 XJXABhu6vb4IObjN0DONAF387PJyvWumwf+BsCY0D3GJax6nmLq3SA7+leMJQVn8JOql hlFIHBdiqm2rDqK9lC1XqSbvCNYoouFO5qEwg75QJYVF7o3t4Rwv96GaxJWGt9JhefR8 +A== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2g096w019m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Feb 2018 21:19:34 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w17LJYNA020038 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Feb 2018 21:19:34 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w17LJXJ4023975; Wed, 7 Feb 2018 21:19:33 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Feb 2018 13:19:33 -0800 Subject: [PATCH 2/4] xfs: skip xfs_check in _check_xfs_filesystem From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Wed, 07 Feb 2018 13:19:31 -0800 Message-ID: <151803837117.19313.3481001926133028039.stgit@magnolia> In-Reply-To: <151803835881.19313.17455678207236452557.stgit@magnolia> References: <151803835881.19313.17455678207236452557.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8798 signatures=668663 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=863 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1802070269 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_check has been long obsolete, so stop running it automatically after every test. Tests that explicitly want xfs_check can call it via _scratch_xfs_check or _xfs_check; that part doesn't go away. Signed-off-by: Darrick J. Wong --- common/xfs | 17 ----------------- 1 file changed, 17 deletions(-) -- 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 3dba40d..c63e5dc 100644 --- a/common/xfs +++ b/common/xfs @@ -386,23 +386,6 @@ _check_xfs_filesystem() ok=0 fi - # xfs_check runs out of memory on large files, so even providing the test - # option (-t) to avoid indexing the free space trees doesn't make it pass on - # large filesystems. Avoid it. - if [ "$LARGE_SCRATCH_DEV" != yes ]; then - _xfs_check $extra_log_options $device 2>&1 |\ - _fix_malloc >$tmp.fs_check - fi - if [ -s $tmp.fs_check ]; then - _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (c)" - echo "*** xfs_check output ***" >>$seqres.full - cat $tmp.fs_check >>$seqres.full - echo "*** end xfs_check output" >>$seqres.full - - xfs_metadump $device $seqres.check >>$seqres.full 2>&1 - ok=0 - fi - $XFS_REPAIR_PROG -n $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1 if [ $? -ne 0 ]; then _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (r)"