From patchwork Wed Jul 24 04:12:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11055661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3986213A0 for ; Wed, 24 Jul 2019 04:13:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 299AD2871C for ; Wed, 24 Jul 2019 04:13:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DFC628780; Wed, 24 Jul 2019 04:13:00 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 BE7762871C for ; Wed, 24 Jul 2019 04:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725882AbfGXEM7 (ORCPT ); Wed, 24 Jul 2019 00:12:59 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:43780 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725823AbfGXEM7 (ORCPT ); Wed, 24 Jul 2019 00:12:59 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O48wYT119451; Wed, 24 Jul 2019 04:12:57 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-2018-07-02; bh=p5N3jmsd1XBGf1W6rpxSCIADVFvWEV7FE4zThCBxGKo=; b=IOa3SOKcOtZ+vht05tZ64pf1S0ey0/zpYef0JnNUp9HRcB+my3CinrEJUAZWnHMDV81I 7RvcJ8eJ/tA8xwL2btIabGutNS0kZH1kISzq44FApMV3vBTPa2DKK8VGQPGtuqawnN+Y IQM8hn7aMLmsoNMGUQVYXd+GXKjLkgJZDG11K8jf/+jDn56YBAeBPJIkE9h74wTQRwqd Ni/NIfhXE3WDCdOcXt3krtBmam/mvwvocXWtaD6i9IwzWCKmALiPb+5Jxje05pb7g8Do bbYSgC9baW9rWjlPG5aG+WkvlcpdkTmnJ0ASkPKNcYfB7smXJPvZo4YOX6wQAyNR082T ww== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2tx61btjsd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:12:57 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O47l2x129559; Wed, 24 Jul 2019 04:12:56 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3030.oracle.com with ESMTP id 2tx60xg8hb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:12:56 +0000 Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x6O4CteP012802; Wed, 24 Jul 2019 04:12:55 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 23 Jul 2019 21:12:55 -0700 Subject: [PATCH 1/3] common: filter aiodio dmesg after fs/iomap.c to fs/iomap/ move From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 23 Jul 2019 21:12:54 -0700 Message-ID: <156394157450.1850719.464315342783936237.stgit@magnolia> In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 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-1906280000 definitions=main-1907240045 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240045 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 Since the iomap code are moving to fs/iomap/ we have to add new entries to the aiodio dmesg filter to reflect this. Signed-off-by: Darrick J. Wong --- common/filter | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/filter b/common/filter index ed082d24..26fc2132 100644 --- a/common/filter +++ b/common/filter @@ -555,6 +555,7 @@ _filter_aiodio_dmesg() local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*" local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*" local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*" + local warn10="WARNING:.*fs/iomap/direct-io\.c:.*iomap_dio_actor.*" sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \ -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \ -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \ @@ -563,7 +564,8 @@ _filter_aiodio_dmesg() -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \ -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \ -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \ - -e "s#$warn9#Intentional warnings in dio_complete#" + -e "s#$warn9#Intentional warnings in dio_complete#" \ + -e "s#$warn10#Intentional warnings in iomap_dio_actor#" } # We generate assert related WARNINGs on purpose and make sure test doesn't fail From patchwork Wed Jul 24 04:13:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11055665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1146514DB for ; Wed, 24 Jul 2019 04:13:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02E1E2871C for ; Wed, 24 Jul 2019 04:13:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBD5D28780; Wed, 24 Jul 2019 04:13:06 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 995D32871C for ; Wed, 24 Jul 2019 04:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725870AbfGXENG (ORCPT ); Wed, 24 Jul 2019 00:13:06 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:53140 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725823AbfGXENG (ORCPT ); Wed, 24 Jul 2019 00:13:06 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O4948b121316; Wed, 24 Jul 2019 04:13:04 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-2018-07-02; bh=OkIEDBKGJkwIgoSPBpimywKdfjEYgnI5gOpFNLXcNHw=; b=phEKu4h/AyNmlQlO1qRa0E8kst3CRQRvZmC1EhSmpSiBqozfEjRzNlbANvq8dVghLg08 TcUwkHe54cIyoB5OBFo3+sDS5ZX1n6WB2scuFISfagGAro5Ac8rDckoGBugnT/8j+Xby K9a2ReAJ78wgRrDGI4VKgojOmYwLt4y4Yq96OutMdW9OfVz854qynj7b5gJnt/uUxcNJ AkYV2oxRTUOGmwe/5IyIYcxvmDZty6icouTQcpB/dkS4qOwNAvQ0AjPJ3wglt9odGswW pHGRVWg4jvDBumrO8MTaaWrg3XXVRl8fEyQpnLHcY5KILxez3+7FXe3YFou08wD6rzfm zg== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 2tx61btjhw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:13:03 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O47kuA049634; Wed, 24 Jul 2019 04:13:03 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3030.oracle.com with ESMTP id 2tx60x08jt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:13:03 +0000 Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x6O4D170027358; Wed, 24 Jul 2019 04:13:02 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 23 Jul 2019 21:13:01 -0700 Subject: [PATCH 2/3] xfs/504: fix bogus test description From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 23 Jul 2019 21:13:00 -0700 Message-ID: <156394158077.1850719.2222567081675874481.stgit@magnolia> In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 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-1906280000 definitions=main-1907240045 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240045 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 Fix the description of this test to reflect what it actually checks. Signed-off-by: Darrick J. Wong --- tests/xfs/504 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/xfs/504 b/tests/xfs/504 index cc6088d1..c6435117 100755 --- a/tests/xfs/504 +++ b/tests/xfs/504 @@ -4,10 +4,10 @@ # # FS QA Test No. 504 # -# Create a directory with multiple filenames that all appear the same -# (in unicode, anyway) but point to different inodes. In theory all -# Linux filesystems should allow this (filenames are a sequence of -# arbitrary bytes) even if the user implications are horrifying. +# Create a filesystem label with emoji and confusing unicode characters +# to make sure that these special things actually work on xfs. In +# theory it should allow this (labels are a sequence of arbitrary bytes) +# even if the user implications are horrifying. # seq=`basename "$0"` seqres="$RESULT_DIR/$seq" From patchwork Wed Jul 24 04:13:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11055669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A533914DB for ; Wed, 24 Jul 2019 04:13:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 941052871C for ; Wed, 24 Jul 2019 04:13:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8574428782; Wed, 24 Jul 2019 04:13:22 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 1CCBF2871C for ; Wed, 24 Jul 2019 04:13:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725894AbfGXENV (ORCPT ); Wed, 24 Jul 2019 00:13:21 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:44116 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725823AbfGXENV (ORCPT ); Wed, 24 Jul 2019 00:13:21 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O49VQJ119871; Wed, 24 Jul 2019 04:13:19 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-2018-07-02; bh=zqraTmXXEHnTmZbvkylDgetuQ2M0MS+oQE5hDFC/6qM=; b=2aMHHJurMzliKikSnow52XHepD++XyQU46norZefsMwyzoXW+hNunW1WyNnhM3iW1//3 t9eC69VW7ROjLL5EBNvkc0Dv+tRbU7nz2NaOLW+FRPPgLFZEaU4kPrYJ5QfZElxBKz5e iSWyiXrWMDcrHIaYh6lplLH96U4/i332cKEAVZAVkzOjgIBoPnPN7Cd8y3fTyIg2L0u6 PkDvV1brG1vECqaCvh0CrKOfgpOZiKX9RLGP33Ma6ESPgvBa/7iog6Y7rqFJBwhZrCAi tMiLCie52mA45qjEuqJp2p5B01UJHSlpXgx4VPwy/s6KSGrel8/vYgpC8sysS5OBRXn1 ZA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 2tx61btjt4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:13:19 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6O4DIGR119938; Wed, 24 Jul 2019 04:13:18 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3020.oracle.com with ESMTP id 2tx60xn9k9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 04:13:18 +0000 Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x6O4DDpe012973; Wed, 24 Jul 2019 04:13:13 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 23 Jul 2019 21:13:13 -0700 Subject: [PATCH 3/3] generic/561: kill duperemove after sleep_time From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 23 Jul 2019 21:13:06 -0700 Message-ID: <156394158687.1850719.7335587409056156645.stgit@magnolia> In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=942 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240046 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=987 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240045 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 generic/561 can take a very long time to run on XFS (45+ minutes) because it kicks off fsstress and a lot of duperemove processes, waits 50 seconds, and then waits for the duperemove processes to finish. duperemove, however, fights with fsstress for file locks and can take a very long time to make even a single pass over the filesystem and exit, which means the test just takes forever to run. Once we've decided to tear down the duperemove processes let's just send them SIGINT and then wait for them to exit. Signed-off-by: Darrick J. Wong --- tests/generic/561 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/generic/561 b/tests/generic/561 index c11d5bfa..2f3eff3c 100755 --- a/tests/generic/561 +++ b/tests/generic/561 @@ -47,6 +47,7 @@ function end_test() # stop duperemove running if [ -e $dupe_run ]; then rm -f $dupe_run + kill -INT $dedup_pids wait $dedup_pids fi From patchwork Wed Jul 24 15:55:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11057129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D4AF112C for ; Wed, 24 Jul 2019 15:55:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 187A92869D for ; Wed, 24 Jul 2019 15:55:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0931C28849; Wed, 24 Jul 2019 15:55:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 AB5CE2869D for ; Wed, 24 Jul 2019 15:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726623AbfGXPzr (ORCPT ); Wed, 24 Jul 2019 11:55:47 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:50860 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbfGXPzr (ORCPT ); Wed, 24 Jul 2019 11:55:47 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFn83v038975; Wed, 24 Jul 2019 15:55:45 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-2018-07-02; bh=2kF+fA9q3kgCJsUPvbU/03EiMt2/k7q/8VjBwchvVpU=; b=wAZQTMXw540UJ/cmO4q+ufZVEM1PiBExX/GJGZpYn/HBAvddJA4U1A7xN64LQ9TyLgF4 nxOBZYTBrG1f6Ex2n+PdQ+ekA/3xoI8wYy5VG6wVkmTQkddRuc+VAmoQU+lPexV9QLBm XNPeD8/V55jatQC//DwR4jXnW60JOs5zC29aSucGSPxPAM7M7C+KJakWXOutuG6Jb/eU fo0K3wt9BPYrybxml69bA9lUAY9x4OpktxQtm7Y7N9OZSPyztK2ioOHLKsNlL78B7mup vyCs9fXNk3u5pFGRbfIwUiH62BLbaHWJQi1GGVhAoEv//8G+AhwQFau3DizrTikz0lox Ew== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 2tx61bxdsu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:55:44 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFr4mv053693; Wed, 24 Jul 2019 15:55:44 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 2tx60y60k9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:55:44 +0000 Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x6OFtimt014689; Wed, 24 Jul 2019 15:55:44 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jul 2019 08:55:43 -0700 Date: Wed, 24 Jul 2019 08:55:43 -0700 From: "Darrick J. Wong" To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 4/3] generic/506: mount scratch fs before testing for prjquota presence Message-ID: <20190724155543.GE7084@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=943 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240172 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=988 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240172 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 On XFS, the _require_prjquota helper takes a path to a block device, but (unintuitively) requires the block device to be mounted for the detection to work properly. Fix the detection code in generic/506. Signed-off-by: Darrick J. Wong --- common/quota | 3 ++- tests/generic/506 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/quota b/common/quota index f19f81a1..8a22f815 100644 --- a/common/quota +++ b/common/quota @@ -68,7 +68,8 @@ _require_xfs_quota_foreign() } # -# checks that the project quota support in the kernel is enabled. +# Checks that the project quota support in the kernel is enabled. +# The device must be mounted for detection to work properly. # _require_prjquota() { diff --git a/tests/generic/506 b/tests/generic/506 index 7002c00c..e8d0ca24 100755 --- a/tests/generic/506 +++ b/tests/generic/506 @@ -51,7 +51,9 @@ _require_scratch_shutdown _scratch_mkfs >/dev/null 2>&1 _require_metadata_journaling $SCRATCH_DEV +_scratch_mount _require_prjquota $SCRATCH_DEV +_scratch_unmount testfile=$SCRATCH_MNT/testfile From patchwork Wed Jul 24 15:56:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11057133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24C3B112C for ; Wed, 24 Jul 2019 15:56:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1076928821 for ; Wed, 24 Jul 2019 15:56:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 046072884A; Wed, 24 Jul 2019 15:56:18 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 99FB228821 for ; Wed, 24 Jul 2019 15:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbfGXP4R (ORCPT ); Wed, 24 Jul 2019 11:56:17 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:41012 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbfGXP4R (ORCPT ); Wed, 24 Jul 2019 11:56:17 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFnACV149988; Wed, 24 Jul 2019 15:56:14 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-2018-07-02; bh=a8O9hlf+hW6/rtEFQ1VPhQMJaK6X/g/S1Gs6akuO1uo=; b=qG1/20/ymt5G8pI2MiK4sWR/rLw6M5f241f7ngC7cfbyY69VOsorSvrZn2TGK711Le4q BGbilud1F6C/iERS5erXlmRbQ4pY0YVSZwwJOK90gUMRiFntjQMBQsGAnhi165zSisfb 7ADk5BTj7vDN/EI6l4nPSHndxbprn+Y0VpaPCU6yuaNvITzQ7OKfyFUd5JokUDs+33+4 kHgXIC7USOw3mReI3WIyxt7pZR9M8IxzDzxgkt501PnaWo31PrAo8cpfBinkUj33YtDy IApL2XZG7G9o1oMs0m/BgE3Wm/GuVWiCPcE/uA5KcCt7tBsMKZjStaJF9FcFmmwErYhh 2A== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2120.oracle.com with ESMTP id 2tx61bxdpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:13 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFr4u7139037; Wed, 24 Jul 2019 15:56:13 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3030.oracle.com with ESMTP id 2tx60xt8tg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:13 +0000 Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x6OFuCMd003863; Wed, 24 Jul 2019 15:56:12 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jul 2019 08:56:12 -0700 Date: Wed, 24 Jul 2019 08:56:10 -0700 From: "Darrick J. Wong" To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 5/3] various: disable quotas before running test Message-ID: <20190724155610.GF7084@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 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-1906280000 definitions=main-1907240172 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240172 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 For all the tests which require that quotas be disabled, remove the quota mount options before mounting the scratch filesystem. Signed-off-by: Darrick J. Wong --- tests/generic/384 | 4 ++-- tests/xfs/030 | 2 ++ tests/xfs/033 | 2 ++ tests/xfs/065 | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/generic/384 b/tests/generic/384 index b7c940d7..33098a38 100755 --- a/tests/generic/384 +++ b/tests/generic/384 @@ -37,8 +37,8 @@ _require_quota _require_xfs_quota_foreign _require_xfs_io_command "chproj" -# we can't run with group quotas -_exclude_scratch_mount_option "gquota" "grpquota" +# we can't run with group quotas (on v4 xfs); the mount options for group +# quotas will be filtered out by _qmount_option below. dir=$SCRATCH_MNT/project diff --git a/tests/xfs/030 b/tests/xfs/030 index 5ed99628..10854c8a 100755 --- a/tests/xfs/030 +++ b/tests/xfs/030 @@ -28,6 +28,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common/rc . ./common/filter . ./common/repair +. ./common/quota # nuke the superblock, AGI, AGF, AGFL; then try repair the damage # @@ -65,6 +66,7 @@ if [ $? -ne 0 ] # probably don't have a big enough scratch then _notrun "SCRATCH_DEV too small, results would be non-deterministic" else + _qmount_option noquota _scratch_mount src/feature -U $SCRATCH_DEV && \ _notrun "UQuota are enabled, test needs controlled sb recovery" diff --git a/tests/xfs/033 b/tests/xfs/033 index 5af0aefc..75b44f38 100755 --- a/tests/xfs/033 +++ b/tests/xfs/033 @@ -28,6 +28,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common/rc . ./common/filter . ./common/repair +. ./common/quota # nuke the root, rt bitmap, and rt summary inodes # @@ -80,6 +81,7 @@ _link_out_file_named $seqfull.out "$FEATURES" sed -e 's/ //g' -e 's/^/export /'` # check we won't get any quota inodes setup on mount +_qmount_option noquota _scratch_mount src/feature -U $SCRATCH_DEV && \ _notrun "UQuota are enabled, test needs controlled sb recovery" diff --git a/tests/xfs/065 b/tests/xfs/065 index f09bd947..b1533666 100755 --- a/tests/xfs/065 +++ b/tests/xfs/065 @@ -29,6 +29,7 @@ _cleanup() . ./common/rc . ./common/filter . ./common/dump +. ./common/quota # # list recursively the directory @@ -57,6 +58,7 @@ _require_scratch # so don't run it # _scratch_mkfs_xfs >> $seqres.full +_qmount_option noquota _scratch_mount $here/src/feature -U $SCRATCH_DEV && \ _notrun "UQuota enabled, test needs controlled xfsdump output" From patchwork Wed Jul 24 15:56:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11057137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6A23213A0 for ; Wed, 24 Jul 2019 15:56:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57FDC28821 for ; Wed, 24 Jul 2019 15:56:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A68D28868; Wed, 24 Jul 2019 15:56:39 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 D8B8928821 for ; Wed, 24 Jul 2019 15:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727041AbfGXP4i (ORCPT ); Wed, 24 Jul 2019 11:56:38 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:52048 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726856AbfGXP4i (ORCPT ); Wed, 24 Jul 2019 11:56:38 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFn82C038980; Wed, 24 Jul 2019 15:56:35 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-2018-07-02; bh=a/oqZzUmf/jcbt5gnbG5g+yEtlBLX2evki3ldhAK+24=; b=X6znpryCmwpXxvrGWr1Pl7+dDuATf2FR1GY1gjswmqRuONbsaM3ogvr8XBIswPIkOh2U eNiAnWq+/KRvRLHuJV7Wv4edogWOt/zzYYz1xQeOl2a2ftM3IKfEv2zHGIBQBVC4bl56 zdpG9nNzghxESAYlooBX3bORb3rbDJzisPTDE2UEwzQEmdwitWmVZXCh+SV+R2Y2jr7V KdSz+QK+Q2i1jTypBX3HnAuJRCkCWuNLr5QqYjTZva7bw1234d8lleMn+lC7g1sYL3Jp 0nhvMmoZlOsZz9l4e8Zu7qYoXh2+BC3du+WOhE44GXFIMzCjwlNTXgxTtyX3S8sox5YP gw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 2tx61bxdy6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:35 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFr6AR053987; Wed, 24 Jul 2019 15:56:34 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 2tx60y614h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:34 +0000 Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x6OFuWeC017959; Wed, 24 Jul 2019 15:56:32 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jul 2019 08:56:32 -0700 Date: Wed, 24 Jul 2019 08:56:31 -0700 From: "Darrick J. Wong" To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 6/3] xfs/033: filter out root inode nlink repair Message-ID: <20190724155631.GG7084@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 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-1906280000 definitions=main-1907240172 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240172 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 A couple of releases ago, xfs_repair was patched to set the root inode link count correctly when messing around with lost inodes. However, the old xfs_repair remains in the golden output, so remove it and filter the line so that we don't cause 'new' regressions on old software. Signed-off-by: Darrick J. Wong --- tests/xfs/033 | 12 ++++++++++-- tests/xfs/033.out.crc | 2 -- tests/xfs/033.out.default | 2 -- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/xfs/033 b/tests/xfs/033 index 75b44f38..0ce67a9c 100755 --- a/tests/xfs/033 +++ b/tests/xfs/033 @@ -91,9 +91,17 @@ src/feature -P $SCRATCH_DEV && \ _notrun "PQuota are enabled, test needs controlled sb recovery" _scratch_unmount +# We fixed some bugs in xfs_repair that caused us to have to reset the inode +# link counts on the root inode twice. That wasn't related to what this test +# is checking, so remove the nlink reset line from the golden output and filter +# old xfsprogs to avoid introducing new regressions. +filter_repair() { + sed -e '/resetting inode INO nlinks from 1 to 2/d' +} + # rootino, rbmino, and rsumino are now set (lets blow em away!) -_check_root_inos 0 -_check_root_inos -1 | _filter_bad_ids +_check_root_inos 0 | filter_repair +_check_root_inos -1 | filter_repair | _filter_bad_ids # success, all done status=0 diff --git a/tests/xfs/033.out.crc b/tests/xfs/033.out.crc index 2ab4c432..594060f0 100644 --- a/tests/xfs/033.out.crc +++ b/tests/xfs/033.out.crc @@ -30,7 +30,6 @@ reinitializing root directory - traversal finished ... - moving disconnected inodes to lost+found ... Phase 7 - verify and correct link counts... -resetting inode INO nlinks from 1 to 2 done Corrupting rt bitmap inode - setting bits to 0 Wrote X.XXKb (value 0x0) @@ -125,7 +124,6 @@ reinitializing root directory - traversal finished ... - moving disconnected inodes to lost+found ... Phase 7 - verify and correct link counts... -resetting inode INO nlinks from 1 to 2 done Corrupting rt bitmap inode - setting bits to -1 Wrote X.XXKb (value 0xffffffff) diff --git a/tests/xfs/033.out.default b/tests/xfs/033.out.default index 68bc7810..be297e5a 100644 --- a/tests/xfs/033.out.default +++ b/tests/xfs/033.out.default @@ -29,7 +29,6 @@ reinitializing root directory - traversal finished ... - moving disconnected inodes to lost+found ... Phase 7 - verify and correct link counts... -resetting inode INO nlinks from 1 to 2 done Corrupting rt bitmap inode - setting bits to 0 Wrote X.XXKb (value 0x0) @@ -122,7 +121,6 @@ reinitializing root directory - traversal finished ... - moving disconnected inodes to lost+found ... Phase 7 - verify and correct link counts... -resetting inode INO nlinks from 1 to 2 done Corrupting rt bitmap inode - setting bits to -1 Wrote X.XXKb (value 0xffffffff) From patchwork Wed Jul 24 15:56:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11057143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7560E13AC for ; Wed, 24 Jul 2019 15:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 652D62869D for ; Wed, 24 Jul 2019 15:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5900528849; Wed, 24 Jul 2019 15:57: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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 C48902869D for ; Wed, 24 Jul 2019 15:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387444AbfGXP5B (ORCPT ); Wed, 24 Jul 2019 11:57:01 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:45734 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387438AbfGXP5B (ORCPT ); Wed, 24 Jul 2019 11:57:01 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFnCRL147076; Wed, 24 Jul 2019 15:56: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-2018-07-02; bh=eeOdLjJGv7S/rDnuCeHmtRrCDAgXepfj6hBfpcUZXWA=; b=yTnKuXiFxPpafXy931rOKuHPba8UzHM9BN/oZCZeBjYh0PnAG1VpLf2se7omQngz/9cJ eersgTl9OxTnTHQDLWZZMtAR/XHeqh5WuEIVO6uHH4fK7z/P9e6ziM+Qq2EUxFtQVYHF yCaXoYVI7WHFLnRDrxbLrn1M83zVHGLQ9VhiAxyIZJbUP8nymWHhvBxE9JYanQk0pJ77 VQ/WsZOnuDb/qyFC88CBws5YOf2fHp84CI4nZSmyxatTThpglArQZEkM6Koo221kxxFg jPHGgKAHIXv3ZY3zjJ0O866RhEELrvTXGBvoyPHfiu7Sqxs2/6LdAGfLoZx2ffFp77YK jg== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 2tx61bxde4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:59 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6OFr7Fv054066; Wed, 24 Jul 2019 15:56:58 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 2tx60y61dw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jul 2019 15:56:58 +0000 Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x6OFuvGV015495; Wed, 24 Jul 2019 15:56:57 GMT Received: from localhost (/50.206.22.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jul 2019 08:56:57 -0700 Date: Wed, 24 Jul 2019 08:56:56 -0700 From: "Darrick J. Wong" To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 7/3] xfs/194: unmount forced v4 fs during cleanup Message-ID: <20190724155656.GH7084@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <156394156831.1850719.2997473679130010771.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 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-1906280000 definitions=main-1907240172 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9327 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907240172 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 Unmount the V4 filesystem we forcibly created to run this test during test cleanup so that the post-test wrapup checks won't try to remount the filesystem with different MOUNT_OPTIONS (specifically, the ones that get screened out by _force_xfsv4_mount_options) and fail. Signed-off-by: Darrick J. Wong --- tests/xfs/194 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/xfs/194 b/tests/xfs/194 index 3e186528..1f46d403 100755 --- a/tests/xfs/194 +++ b/tests/xfs/194 @@ -18,6 +18,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { cd / + _scratch_unmount rm -f $tmp.* }