From patchwork Thu Sep 9 17:41:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 12483613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AB60C4332F for ; Thu, 9 Sep 2021 17:42:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77C0D61132 for ; Thu, 9 Sep 2021 17:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242269AbhIIRnW (ORCPT ); Thu, 9 Sep 2021 13:43:22 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:50170 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242746AbhIIRnF (ORCPT ); Thu, 9 Sep 2021 13:43:05 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 189FP4dv016559; Thu, 9 Sep 2021 17:41:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=mTlIcwtBpMyJww31eheea88S6OPEz1/i7BchCMUGOuc=; b=NFZslMbb58VaZ32rRgNCjf11cGae56Qn5H//cfrXONbOhALRKSKTHYX1qYJYmdGFmgkr LsKndZsB8SpP1887KPM9iMuPaHEcz6gnz4BLddbwpYMGMcLYabXp9I9T9CKIZGePM8zC Esa+EIKBhQtAKiEm9PEb6pEWCeL6MNQK3+VLTXMQmqKUCi+0uTKL53X0C4S6h8mWZsDJ phsz2TkFBc5FTGHaJ9BvIiUQ+ccVwFS3Jza9NvQrv0J5HyztOkY0j6BRmeJAw0DHLC9U yUwRCjRqsIEqKffW+jCwLUD77CGLzONkhwh9LMpXfszh2eVEbZA4Megdr/M+qYnIUxqE MA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=mTlIcwtBpMyJww31eheea88S6OPEz1/i7BchCMUGOuc=; b=vG/zcBu2uPzuAuCU6LVKQEZn/lICwv9ZRBxNXxDR78PTe3DAdGXBn+NALlS6W87+70Ka H7qqeRLGUoq9Czsxd7spbpoZLpr8Jh8SMGod+f2jwZaS2gn6+Y2/K3BgLt2DpjIurlWQ E9pMjrAiaGm3F+wU7s9MAx7+lpw00rHXoiOezvPRn6f64qVTplgc4c7FArAF6b/vR/Sw zNrk8iLE6Szp7Z2GpgQjvEHhElBrGcaHRMyr70c44mGwjnPP3WO/lVvNJLvfTY2Zyjyd YHrMwNpLnVuRSvwk4VJkiKv0gpsp3bECmo6eeHWEuueHULBDCkVMC/20LUzeZU6LYV1T fg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3ayf8a9hph-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:54 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 189HQqdQ102240; Thu, 9 Sep 2021 17:41:53 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by userp3020.oracle.com with ESMTP id 3axst5sdxj-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KqSuUPAMF03xBVVcgtWgpO+P6czptRrUg7ZiQ4FqkYv32IFEtXFAevEVTsDdY0duMUBSR6eVa1EI4UQ3IfuZC7lO7X6BnElgZFhz7srMJMAaKH/mSjkityKOnv5hcJ5IQAlPkxOJBf7iRP8H7f/SUAIGPlhT73C1NTAQ7Kvwlpqbcrz0J92jZaiuSw977y7CgFERdoIjotwJ6ioSrjYLsd1sJeO/Eu58LLAR5xlTKkmCSca5whxP4mg6LSDzYM0opwBT5/lMLPL1t8UoIIzGB6gkaxANmI0d9ZNPrDd840HjJwnq3XF3Y6JCp1dLC0Av51eB9XjuWI9ITgqpG0rY7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mTlIcwtBpMyJww31eheea88S6OPEz1/i7BchCMUGOuc=; b=fru5RLy8HB484actu7g8NoujYMW+pT+u5hXS1YN+TmgnOF53q9Rnck1EpH6vrwTJMSRYymrrFzwB76Uur8jBYQJj5FXljIXFJ1eoWFM9foDQcfMH86RMidYWzlg4IhMGgoAFR30h1uV8QpbwCn7w9+prp+FsHn0Q3hMLtNgrNhW+o5llEN2LtIKsfBlyvK8ltj1fdyh9+s0ghSLrzerCgjFX3dnxTZWsb1aRJEQ2uc7M+ias8YbSs0SC65FCGWX6nZCuzdN3H6ADfPk3YhAXrGqKWEuetCS4W5WAmahgh9I1zRs1SudPHGnPg8jJF/c9GLwQtk1zQacg5Y8O1CkPNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mTlIcwtBpMyJww31eheea88S6OPEz1/i7BchCMUGOuc=; b=BMA6yxwSGsnrdQz5riRenAI2cR64uyra7JwpD6XA3j4s7Alg4eZqXp+i99LyJX2NC2wE0gBhJbrfNf9bp1LGv/OAGAmMKfJjXs+ss4prjEpFW/mb8hoqmS+8vf0llYw+SYVvUz2Q+CH4Lxe4PEd4fY5sW5vKRP3d1M6v6E7dZuQ= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) by BY5PR10MB4321.namprd10.prod.outlook.com (2603:10b6:a03:202::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Thu, 9 Sep 2021 17:41:51 +0000 Received: from BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64]) by BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64%3]) with mapi id 15.20.4500.017; Thu, 9 Sep 2021 17:41:51 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 1/3] xfstests: Rename _scratch_inject_logprint to _scratch_remount_dump_log Date: Thu, 9 Sep 2021 17:41:40 +0000 Message-Id: <20210909174142.357719-2-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210909174142.357719-1-catherine.hoang@oracle.com> References: <20210909174142.357719-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) To BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Thu, 9 Sep 2021 17:41:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea4fea95-3b7d-405c-3a6f-08d973b91b46 X-MS-TrafficTypeDiagnostic: BY5PR10MB4321: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h6ZY6r+WjTmIcuuv0QPJSi9Jc60RdynDscAse5PeZ4+M7vpQeCzTnUZITG4+vzPjGabxDQBS6wzmD5vX1oZ6Cn4oGxMZooPUTfCqBz1Ym1pskgZDef0p9d76NoHjXQ02AHaqVieDtRDSkMpbL9cMO69MLpqQ5q4jWM58GLv1RrtPHwmDZY5UmQceQldBIXNaiw/5qjrO7l67wHdOe0Jox/xAjnRNeT37I2vLo86M0ZFEjXuidD/tPRMmh7BbfBwbBYNGUxUjB554vd8ogRy1pX03gKh2l+rT01xEJoHmJ7YoULQuABVkt0MmX3viHGCE5MfwUGGWpunvK1gd5mobVKhDbqyZpkIyi1Z0JUWD3zhAaZBPYqWPcTAW9ftyTSNZHjLSPYBel6Joeldn5WmEl/Q5TDM+fgfZpsfaYSYIQUtz8dO5I8af7tlIhTil6cEcn3CynAdlm81L0Z5pGu8rRx9udNXmv9/VsOQsf9Cy4dWQAE4DS87xyEgAUcrXu33LXJwXRX6nFJZmiats5J1n/adU1WGwpuhd5Z5aUwMf6m8VbyQ1nokTR8zgCsfD05dGpGYFtUYJV1ZF4QoIiNVb+nz4skGGb4MqpsR9Cdd4IshnqmwfLUxusFIQ7CRl8zRTes+cvCZL4tXyXrYJ2wVzIYf1qbXKuTK3A7XfvPTDAE90960TGk0Is1AaFhY2/9sMwGO59lwy3U1tRVmKTNlBXw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2791.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(5660300002)(956004)(38100700002)(86362001)(38350700002)(2616005)(6506007)(44832011)(316002)(2906002)(26005)(66556008)(83380400001)(8936002)(6666004)(508600001)(186003)(8676002)(6512007)(1076003)(66476007)(450100002)(52116002)(36756003)(66946007)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EN+9N8sZGGrWfmHrw6vl9VXTKHy93+WczvFqtR+8Hg7FI4h4Bd8LSQ0za4gagS1Ev3lA9qVfbYvJoK4vg3I+h/xeLjTm4XUDA0Q7G8lDCYB5DBmiL8mW6kesCCGeaJVfnxtojWOfXgbrHzJ5FE4nZARQ3eDa6k+MCDGWMaPzCO4dE7x9eJiS353GAulSRq4np6hATK0FZ5AfO+S0K5OKvZrx5l1jrfG1NQK2l1qscdLfN0Ys74+3r8j1f2LyJiYb+L9JRE7O2UeTexAAPSao2ecK5w1FZrvoK8C4nfX7E7cKF87zNqgiKMoD/KjWqAOM03k7mBEoiLMQ8oNdWUZYKyM7r5nS+hNDjyta+lGFxfl3+/xgFW8fYIf7UBuT55Cgm3al+CJ5jqUpqe3TYfDSkIZYl5fc6+BH1MMSeGCNYSJOKBIpSS7LneR5RWd6HqgGwJR7z0Jdr91QCEnMO26gTMj7NFATlUSzz9Xy4vVxYRcVJ6LuzCR9d1s457aohqtT7aXqOqIdy7+1VmZQNjRnGMrvZuUA0S7MVSFcmTopoTvKD98a3WG2L3vrfu/f9uYfoPscy+q1C6Yrs0ndUOwxEDR7E+hxLkLK/Sii3MD/97vUwa0wznbojaoHxN/7THNPuE+gYd7jY6IbXIskDY3GL8JAAuQ+QFLBwWYV+vpC586eEfYyiVSy9Fc38uAe4rE4ItgYafGSOhZ0m/+IQUSEQmugYgnF5GVGUFILrY+t2F0vwMmzaE1ZwpFEc+3KmVQeJDTeZifsXPK3c0M0hfBCzvcHjQG0on/CrnVHmBnfCIQlmyNsL0S/U8BehzHkVqWgv1w4GjStYB4BWb/ohPh+Y+YsvP847NATDvk7ikPFAZw6oHBXN5V0UrKrMnfSuHkRVBL4u/2Pyue2ZtAbs1WSrYbs97EEDsti7PGNc4SKoLAJgiiHkd2MwPTDu+tkXy6LuSbQ2FwvGF29T6BaD9eX/w6UmTMRhK2R1ETmrrqOLWVpaWhIrtJigH8hwbsKNYQYa+UXms6darlbSlgKwQ19vPpU6VJSxsB6I+Y7vAcUv5bxMMeA9WLgpvQsMo0rcx0nE5+yTOQrGmLVzFtaxp8y/DL3kl/qA/1UQdDXX1ZEOLrpFiXbRVfgHkxAG1WVtOOEc4QJxnYHk1nbVHZG8++vGC1/MVr6zmcYkvAV97u7DEk84Ai9ix6WF5sSBMdnBVuH3s/MLuysfbNv7fFlC0E4U9FP4+h4EADVMBArIXLmjyS8GjmlTwTKKT4tpjsdDHGndRJMX5TulmLM+EN+5aVqV66HuJp8qlL0/Keo5ubYi+HgLdNY3ff7vlyHLpk8BDui X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea4fea95-3b7d-405c-3a6f-08d973b91b46 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2791.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 17:41:51.4576 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Du86DIYTWRP+o0IX/8ErQMKc3zsYJQLy4HgFmIIlqD0RonYtwCmox644GD36lln/ZHWIfiRg0PnRkj2X/c0wLDNVRq9n4Qq3535n8+sWN1w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4321 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10102 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109090107 X-Proofpoint-ORIG-GUID: g7DgtlLoAd8yzEpOD2p0lIpfCkQ_uIq_ X-Proofpoint-GUID: g7DgtlLoAd8yzEpOD2p0lIpfCkQ_uIq_ Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Rename _scratch_inject_logprint to _scratch_remount_dump_log to better describe what this function does. _scratch_remount_dump_log unmounts and remounts the scratch device, dumping the log. Signed-off-by: Catherine Hoang Reviewed-by: Allison Henderson --- common/inject | 2 +- tests/xfs/312 | 2 +- tests/xfs/313 | 2 +- tests/xfs/314 | 2 +- tests/xfs/315 | 2 +- tests/xfs/316 | 2 +- tests/xfs/317 | 2 +- tests/xfs/318 | 2 +- tests/xfs/319 | 2 +- tests/xfs/320 | 2 +- tests/xfs/321 | 2 +- tests/xfs/322 | 2 +- tests/xfs/323 | 2 +- tests/xfs/324 | 2 +- tests/xfs/325 | 2 +- tests/xfs/326 | 2 +- tests/xfs/329 | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/inject b/common/inject index 984ec209..3b731df7 100644 --- a/common/inject +++ b/common/inject @@ -113,7 +113,7 @@ _scratch_inject_error() } # Unmount and remount the scratch device, dumping the log -_scratch_inject_logprint() +_scratch_remount_dump_log() { local opts="$1" diff --git a/tests/xfs/312 b/tests/xfs/312 index 1fcf26ab..94f868fe 100755 --- a/tests/xfs/312 +++ b/tests/xfs/312 @@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/313 b/tests/xfs/313 index 6d2f9fac..9c7cf5b9 100755 --- a/tests/xfs/313 +++ b/tests/xfs/313 @@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/314 b/tests/xfs/314 index 5165393e..9ac311d0 100755 --- a/tests/xfs/314 +++ b/tests/xfs/314 @@ -64,7 +64,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/315 b/tests/xfs/315 index 958a8c99..105515ab 100755 --- a/tests/xfs/315 +++ b/tests/xfs/315 @@ -61,7 +61,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/316 b/tests/xfs/316 index cf0c5adc..f0af19d2 100755 --- a/tests/xfs/316 +++ b/tests/xfs/316 @@ -61,7 +61,7 @@ echo "CoW all the blocks" $XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $((blks * blksz))" $SCRATCH_MNT/file2 >> $seqres.full echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/317 b/tests/xfs/317 index 7eef67af..1ca2672d 100755 --- a/tests/xfs/317 +++ b/tests/xfs/317 @@ -54,7 +54,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file0 | _filter_scratch diff --git a/tests/xfs/318 b/tests/xfs/318 index d822e89a..38c7aa60 100755 --- a/tests/xfs/318 +++ b/tests/xfs/318 @@ -60,7 +60,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 2>&1 | _filter_scratch diff --git a/tests/xfs/319 b/tests/xfs/319 index 0f61c119..d64651fb 100755 --- a/tests/xfs/319 +++ b/tests/xfs/319 @@ -57,7 +57,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/320 b/tests/xfs/320 index f65f3ad1..d22d76d9 100755 --- a/tests/xfs/320 +++ b/tests/xfs/320 @@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch diff --git a/tests/xfs/321 b/tests/xfs/321 index daff4449..06a34347 100755 --- a/tests/xfs/321 +++ b/tests/xfs/321 @@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch diff --git a/tests/xfs/322 b/tests/xfs/322 index f36e54d8..89a2f741 100755 --- a/tests/xfs/322 +++ b/tests/xfs/322 @@ -56,7 +56,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch diff --git a/tests/xfs/323 b/tests/xfs/323 index f66a8ebf..66737da0 100755 --- a/tests/xfs/323 +++ b/tests/xfs/323 @@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/324 b/tests/xfs/324 index ca2f25ac..9909db62 100755 --- a/tests/xfs/324 +++ b/tests/xfs/324 @@ -61,7 +61,7 @@ echo "Reflink all the blocks" _cp_reflink $SCRATCH_MNT/file1 $SCRATCH_MNT/file4 echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/325 b/tests/xfs/325 index 3b98fd50..5b26b2b3 100755 --- a/tests/xfs/325 +++ b/tests/xfs/325 @@ -59,7 +59,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/326 b/tests/xfs/326 index bf5db08a..8b95a18a 100755 --- a/tests/xfs/326 +++ b/tests/xfs/326 @@ -71,7 +71,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs diff --git a/tests/xfs/329 b/tests/xfs/329 index e57f6f7f..e9a30d05 100755 --- a/tests/xfs/329 +++ b/tests/xfs/329 @@ -52,7 +52,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" | tee /dev/ttyprintk -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full new_nextents=$(_count_extents $testdir/file1) echo "Check extent count" | tee /dev/ttyprintk From patchwork Thu Sep 9 17:41:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 12483615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B716C4321E for ; Thu, 9 Sep 2021 17:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 274C861104 for ; Thu, 9 Sep 2021 17:42:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242598AbhIIRnW (ORCPT ); Thu, 9 Sep 2021 13:43:22 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:53966 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242040AbhIIRnG (ORCPT ); Thu, 9 Sep 2021 13:43:06 -0400 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 189Fdr5j029613; Thu, 9 Sep 2021 17:41:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=Z+A289xdW77BAPzyhkhHL2Q05rqvjwmIRFA/zf9YOF8=; b=WQZEhn0DEtMR3RbVrEuotLzXZU5FNK/0VB+TnqxnZS1hQTmJWQ407OcRG0xMJxNrxoJD lLLThA3FAlrw20FfVQ+MPZgw5Lv+1AyQiqC8Km/YZV9RSdFiSP/feVRHSmHB0Ra6n3gJ C1tQO36fHQMF/azsMNKxFbYmWpaC2RQln9B50JdC2RwjvsboN/mMVPeUuGneIUKMxbVu knNzeCIpdCuFp/G+xWn47sNFghx52jYZXREB0CqLqhSME/9OaSQh3Vp7elP1VkcbOts5 aJtJWLQSq6QsYgmCY32m2U5K1cLW742Ub7RYf7miV8VY48Mp6xCLyZedrsWNwv5eyAd+ 9g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=Z+A289xdW77BAPzyhkhHL2Q05rqvjwmIRFA/zf9YOF8=; b=spPif1BGmcpr/4TbZYXwZBdKHmP7MAHItAbOjUeA83CNLSGtcPVW8BJkTrKoao3A0tLm wvIfDwaMC/En2/FJa2aAoRCGp2tgpsox55ZOhqBu/Y1XBv1/hi77w0WHdITfk8Zezbor ELR/dwPn1DjowP4uOvPq84D9694nYF0IHQMW26+vWoQhrFR47aDsYmXH849MuUHpqR0g ujqlMTuHGO2nsnvpZ6Twvodjdolfe55EfmoQ/pkf7cqa2YD9eTa0OtJfHvyBZeX62sAN uq7fNPGFwRxxpJxjvharboEracP7NUCLyOWxrAQuzBiXBnbSubZ5wz41PTq83RPBOEIT CQ== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3ayfe91k96-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:55 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 189HQGZ7172333; Thu, 9 Sep 2021 17:41:55 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by aserp3030.oracle.com with ESMTP id 3axcpqj267-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTr4IVxEGazoMZgW8QOf+ksB7h26cbkTcYypzZ95ChpOp/a4gcoZQ3MMJQWs9B6Z8r1RYqDuAgZlmcHGv6AeaQRMADRAAkJaWLcfXlNgy+G4YPFxOKC6gcbxaX0LqaeZaY+ZDW6zk9c8r4MCmtTLsf1N6NSuQtMNikhTio7wcX7H1IaaQHuf8gbEBCn6E1+tLfqBgG340pnsJL4WCflILJkx3THvSJkujNmz6msQWCOKQhRjfiCvCwadf2QVrJmrKo2S26ogfmSV3a5WZjbkVVRFUxHI2Aa3mZ/BUwTtB+auk3mqnI8JxGVJ9ilz2dT+PBbEhPHrUXCQqimx8Vct3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Z+A289xdW77BAPzyhkhHL2Q05rqvjwmIRFA/zf9YOF8=; b=hMNZxP9wxBqN9p9j3u/rbKq10SAWVDMbBMDtSmNWuIyrKHwUPgSRvryNDgC74zEOwc97X2gSukBXeUXjcjpCOJi9r/YVkrYSjSxBivisDzH0zVMZbEuxsWHqt7qJrVkLgPu80tYo7rIn+2Oy8axV460/plW0q0ZzBY0RcG6dh4qZcK86kjn/t5rXgKVAs3FJKkolVF2asOTmtlXHeApuPZooInjc6z7SNNTBe75AmKDtEbMcl55tfFBN0vGn8viWTA3bJxkrhhb/M5R+X3VjYFag2yNY2LKWdEIiA2jdVFZvaSOe68a5QIHgHvJ7TPcg6IJc4pkXFmSTBmcZRLlsSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z+A289xdW77BAPzyhkhHL2Q05rqvjwmIRFA/zf9YOF8=; b=sV/D7P55iftCDvn3X6ImdnXjEDio6USBWqcTuL/HDuJl6e3Sj29nb/+C2XWPpLBsGEW2tJNFiSAc5rTfgZLPPK/ChDnVnoLxNIDjtXC9ZGLM5tIlBPKJ24e3PZDvc6HZ/8DZvdVuvODktWPLwKHWPJ16X7BNnODqcvCkvPvtWTw= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) by BY5PR10MB4321.namprd10.prod.outlook.com (2603:10b6:a03:202::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Thu, 9 Sep 2021 17:41:52 +0000 Received: from BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64]) by BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64%3]) with mapi id 15.20.4500.017; Thu, 9 Sep 2021 17:41:52 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/3] xfstests: Rename _test_inject_logprint to _test_remount_dump_log Date: Thu, 9 Sep 2021 17:41:41 +0000 Message-Id: <20210909174142.357719-3-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210909174142.357719-1-catherine.hoang@oracle.com> References: <20210909174142.357719-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) To BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Thu, 9 Sep 2021 17:41:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c728bd9-6994-4f1e-7dd2-08d973b91ba2 X-MS-TrafficTypeDiagnostic: BY5PR10MB4321: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uhcM7hVwgHKREJ82WkdR37dPitwN/h1F15YpGQDG4nw/bvTYzql+Omq1B+TgJ6e2qCihWjdhNkZijW64HYu2s++zaqkN6Rfymf4kH2LXxz9LmI5PH8BQXNlNPvyqM7aBEbwGxkRON2Mx3TRE481iH46+lWb0W14XE995r8GcQvQ4vk8gOGNv1rXAVLOPQczBSVmksAZ8N3p9KhFnCqwkirWVrKAW2JHvnS4WfL3iUdndZ7x82ZQ3lhqg4gNoEifvjDsl9Wwj8gpzpf7X3Sl1a1NcSWBqkfOSS6UAcajUBXCyRnzir5MEJsUk1cspui++yeBBI/AyUHzOmnbYemVDmhNw+qDJYAB20kje7LUxBHY0wOFnUmKEgYP0cPgBGs31fpIAG/XvHS2OtJRaWOT//EpTirVUHfksfrTtveMLqYp/2y8M14aLRoz3UbPTWQpWOXxBFC7TASGNDLTdfSI1p8xNVHebUnATKPQd9CryQ2wcpmR7HiT3wINGzro7U9O0LhxKj9dqEYxtG5tAZv8NtyScsaGtp8TA9GNGUbzPxRvttUGRFVA6Rmy88wU5ezxEslGiOP9xM9Q65piWYWgOVXqmjuD+sFGOyqETGcvEnyQLul4j1EtUhQ+t9IpiGpqFYcJ0bkabFncanidPkOsrOJ/22QNgY9w9R9hytOIVTsc6FO5lCmOimv3ybuuRfaXoTX3+o3ifwbYdl84mXAd4Fw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2791.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(5660300002)(956004)(4744005)(38100700002)(86362001)(38350700002)(2616005)(6506007)(44832011)(316002)(2906002)(26005)(66556008)(83380400001)(8936002)(6666004)(508600001)(186003)(8676002)(6512007)(1076003)(66476007)(450100002)(52116002)(36756003)(66946007)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sOZuLJugYWGuDGKC4GYXJBH8b6DWrqapoW0HfOhCTwTZ9VClErL8DcM1q5NmtkQLqq1prwvGy+wlh4BS3P66cAt5yA4ilEgReZDY/yH43ROHlqiO2Ib/DmdgYQBq5IL6P98boG5HYoptJzdMjM7b5sSHxbbV5B5ljbNP5RB5RDkMWmyix0L0wrpBo995WM6G0/CWPiZMC1sk63HqIosaQqDbqM0tI5UhXfOoDPrAl+k5O26+WWJz98/lAKlvupijVLNS1y1IhbQYg7zn401iHOFhjRNHluqUGvg+XKWFX5lCT1qFtIKNoG0XvymOASdL4rrRTZ6pS+DyG2IsbPmBFgsnUIqaOmVvu0chJrPEWhfttCSdOG9gJvgNG9Eo35Y5ZjM3sxORz20deybu5xj6V49nR7pi6n4lXSMlpc9qF8b2Gu9QZs2Ql/V2sOV0dDX6SdJParSzJKXI8TJQFdYeVvZik5YUprNqNwb82+aX9OHIyLFm4Goda3r/KVd+Cjx9JWYzfHk/6/VuSkfXm84BDkVLoscJb8T98O6P5k/NNfV768wx7caIawgZKfZondMOJvWOQjKrVozn/SN2Kf/IC1lvOL0NHgZC/Hby7k60IOYG1kts6MB2wD6B2e7My8dKaOKEO6HXi2X1M5KzxOTWlpZnboLBiwtwRME3Op2eHaQxHjtRcxpO81544YOebu35Y6KDkR1328HquUO31zzpKMGNH0IQbeFDsq27vP0JJ1IvyYhQ79IcEsdgG12OAnfYO5mFZzNTJMp2NHnBV+/++H3wzbZ51noG3FxTLymMj6o9DFsJJZnIqdyOL/m9mkDwZLSt4mPnpG8sOXzcCfGXg8nnQ2xU9JpJ7Y8CoaN2nnJLPjgpi1L/8N/lhb2vlccIn7JnVaRAa7944m2cULbCs1Rpy2arbUW07QFrla9ywMhYM/NvgiWjZHO8ItHlHFVDzluV0UJd7Ujj+QJ2pa3MmE3LLoEh/rYhy8eI69FSzraWDoTs/ZehrkZs/MVSNENEsc+ey7t2tQsZcK94qWoGh8A9GJLY4lOCzi3wa0dbvfz8IvtPFqOC2r83iSkyTM8I4AvcJmYL4RHSKOJfwkMIlsMM8vI5wjRujKedwdRZc3Fm6H7GNR7EFRdyestR71zQ9yEria8sXQ4mXefmjmnH46UGC95OsF/U+IElR9YXnXaphhYgVin6PPoFkEpBKqmz/cwt/byXR8ow8eMyPTux6VP5+RF9e66aW2kC/XJJ7euo6mff+avIVZpnjE8u8Q2TpPaAsU85Ptk/qVP1JjSEJz5LYGO4wtfdZ76Ck56GmfNSaa1HfAcDwBpYRu2LaH0q X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c728bd9-6994-4f1e-7dd2-08d973b91ba2 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2791.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 17:41:52.1282 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: z3I8go01VGj3z8SX3XkbFVzaWayAJ1Wb79ElIe+WR4D4zqKBOEsZh+VGEKpmvYvQTUonJgM71S75xoM56cQ1vXiwPypguFSZZxP5xAYPq4s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4321 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10102 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109090107 X-Proofpoint-GUID: lvvOROpyEC9QmAmATxUWYxOB_hAyQ6n7 X-Proofpoint-ORIG-GUID: lvvOROpyEC9QmAmATxUWYxOB_hAyQ6n7 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Rename _test_inject_logprint to _test_remount_dump_log to better describe what this function does. _test_remount_dump_log unmounts and remounts the test device, dumping the log. Signed-off-by: Catherine Hoang Reviewed-by: Allison Henderson --- common/inject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/inject b/common/inject index 3b731df7..b5334d4a 100644 --- a/common/inject +++ b/common/inject @@ -126,7 +126,7 @@ _scratch_remount_dump_log() } # Unmount and remount the test device, dumping the log -_test_inject_logprint() +_test_remount_dump_log() { local opts="$1" From patchwork Thu Sep 9 17:41:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 12483617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A16ACC4167D for ; Thu, 9 Sep 2021 17:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E02061104 for ; Thu, 9 Sep 2021 17:42:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242122AbhIIRnX (ORCPT ); Thu, 9 Sep 2021 13:43:23 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:27506 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242709AbhIIRnG (ORCPT ); Thu, 9 Sep 2021 13:43:06 -0400 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 189G53nx010988; Thu, 9 Sep 2021 17:41:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=HIO/jFq5tYVUzGBLJznMEzYsruPb2F9wV4IiIv0R0Ao=; b=nACBPROs557amhMi7qrzzHzkgVGEnza67f4eT590mtTJHTUrRaj12QTYN7Xr72k7Jprg TdrW/ZqmKDf2erLwd7TlN5rO8UyqNQ3uQfr1fozJprFo3jVSZqC5Szo5OXRctBWFZ8DI y/Yc0EMCegh/+NMYp8DYqJ3m+9lrq8WgfdaVG2l8MwyPJRdeoufE+INg/MNgENDdkRHy KsevqbUKq27RPtwkAtR0SEGgd55WcbXyu+v0KP+amlJBw+/9Don1o+ieTUhVTYkVDe+/ fTBWF1cWq11kqgbDOfzp/soqTVpRsrR1aamLcWlVTjEGUnzjvNCBO0MBrt1gJOQPFgnw 5Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=HIO/jFq5tYVUzGBLJznMEzYsruPb2F9wV4IiIv0R0Ao=; b=Ai5Yv7z0Juy8CvMW+jtM0RoeMHFraQJslPMAOuGSi9keMLbqfFRnNTvdDYRG8fsxc3aY x6z9ZDalWNm8aGQDg0acVg5CAy1zLhWql3sXpF5Y/RKzYCoho7QJLKyM9uBVN3GaCkX1 4oDljyjK44OrWlt+KSQVYeMQKI5JH2tvGkuhRajjAvg2xxRoYGD75dj6+B7/InoUnCFT N8CYQRvQe+8ystJTrOq44yc8pGkOVicxzuJrEs0tDSEKt2tmcoX1mezl/F7TOwaEOYGl qYpfX7FC8mSvL3w4MrFX/yvdL+nrkpYgwalK7HHjKYV2k/JSra741ssA7BfS9+N/qTLz Nw== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3ayfrpsd4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:56 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 189HQGZ5172333; Thu, 9 Sep 2021 17:41:54 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by aserp3030.oracle.com with ESMTP id 3axcpqj267-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Sep 2021 17:41:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0bnCQHCg1VTtSkFEiffIUgZug/tyYPzQfrP1koYyWyTzgKxmjWNn3GpO+Lnzah2uwqRetlklqBmyx65riTJ3iwtJPeptsySM8Th9VW0FYzvQgq6Hlp0LEsgldqgg6kHeuUv75LZMHgvzAHU8tV0d9caosB0RIzxcuh91nXmFwT3ZmqWILPid+UUAeNjQsIp7goXfFzZDqFJQGU2FHnWVfL5Q9OVx5Z5cnNAZxuXGDUCKxiHDF9LENt+kRigcf5VS7kLFmzllr6YV1ySmUtP229Haf6DXwFlC/dO6qDgdMwfM2LsSi2JQ5t9t7aY218hUCaUmo5p7RXMEcqPfPPRwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=HIO/jFq5tYVUzGBLJznMEzYsruPb2F9wV4IiIv0R0Ao=; b=JAiM6Qsp29tapz+bu338UKR7Nv3WuLJf1lNfw/FFpKZF+Kd4niaDadV4VCVYDdNzq3IL4JQ1IPbuEo/OBWDY7y0/YdW4G6uzXAaVw6T718j/aUdFK3RDFLb03mTYPWClffjlwva71L2WhABrxt1A3nD3TUekHQHyw6LP8l7zKyRO4VIaJnN1mcwUya5KwyMpUjMijFi+Ygd8DMyO2Nr7jc3wWpDDTqqXx7Fjqnyz5sDBz7ztVXSJJekfiPxaEVrTC5S+lxb9jTiuGXAd3n5pBOQ1YzADd6xajH3pb00oUNsxFHl09iigs63arvmX37oAMMtGaEofNxLYBjHCXZCEFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HIO/jFq5tYVUzGBLJznMEzYsruPb2F9wV4IiIv0R0Ao=; b=DI+c2Iahj8Tw58SekbR3NYfm43+rkkY7rJD8oEnZNCYTXk4sz1lLUT+1BPbScb7O3Iepa4PKj/7Azy5EXo69T2Vq5eBx7wSU5ciYiS7qcuv/bif7106udPOuE+MzPVKcqjnkxC44lN00FNWlVGtW4jzo3aEhm0kpcZMGBf8pNFo= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) by BY5PR10MB4321.namprd10.prod.outlook.com (2603:10b6:a03:202::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Thu, 9 Sep 2021 17:41:52 +0000 Received: from BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64]) by BYAPR10MB2791.namprd10.prod.outlook.com ([fe80::4cf6:23af:2f90:3e64%3]) with mapi id 15.20.4500.017; Thu, 9 Sep 2021 17:41:52 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 3/3] xfstests: Move *_dump_log routines to common/xfs Date: Thu, 9 Sep 2021 17:41:42 +0000 Message-Id: <20210909174142.357719-4-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210909174142.357719-1-catherine.hoang@oracle.com> References: <20210909174142.357719-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) To BYAPR10MB2791.namprd10.prod.outlook.com (2603:10b6:a03:83::16) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by BL1PR13CA0349.namprd13.prod.outlook.com (2603:10b6:208:2c6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Thu, 9 Sep 2021 17:41:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffa07cb4-462e-4b38-e79f-08d973b91c07 X-MS-TrafficTypeDiagnostic: BY5PR10MB4321: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IeghJq1Aep2jLRCDZ90/intsaQa1yrDpa1fhq+P7Zr1/OmXgegL4RNoYOqNKgCOuiieDMX/9lRqF37NFZAgzxx1xVbGlTx9IcCxhC9NlGPuX8zZx3mLAneg1NkrG/fqeMgcFdnQ+tlBFiQscdYS44LtrIc6tvOopsz8LQeWfx7BIxsY8gzUoPzNsoNmQjYFpUfCpfX/b5hY7lWrLJvwXEFnvxBpTyiZ0YbGlRrcs4ubmy2losMRFcKvqjQtMHyN0iokS9lWpEuTaJylTpD/NF7ZjQxt6Q2sBkKKrIJGmM7w8OCEZIdFwk4MwSeUCObaI3zqRyNew3J2Py5X8LaQFOgM9oHgnBN00hscQGDEsW+VY+HY3vjkhSn6cteu9LPCIpOHws189qZ+mFFt/qtHAxNDrAstOKMqtc4fChMCfzpybedh4BACypPNmxuJFTe7hGVtCMjG2PInF0ZGeFfr16ZWwT1OvJPXksx8+sKkX1NOgK6FIOVJCyZzJ9f/k8oOUr3lhZTZZBf53fpiqxYU+kw3cvFfC4MFn0HZK+qF0qhcYcflRNh5zFFPYx5E4wzF02KY7k/jsLtMSQeMiZbon5ADfcpO99Hm/uLAUS9exRyPbv9Tc4mvUqsvGHRQG0aWULNJIgd9RriGMnd5J+PCYrvIqbhI+FX612cN8I5iHckzg5fL9p9vknuAXgvvTIRIfwzRcfSX8C1quXYqhTyo9dA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2791.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(5660300002)(956004)(38100700002)(86362001)(38350700002)(2616005)(6506007)(44832011)(316002)(2906002)(26005)(66556008)(83380400001)(8936002)(6666004)(508600001)(186003)(8676002)(6512007)(1076003)(66476007)(450100002)(52116002)(36756003)(66946007)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: akkUvuh1/bE9YndcVe+ue8dLnYZGsqcfN6c2yYUJQ9kwuUqXE58E9tKR+9k5jHd6Gb0NWTWU0vp61sJXK2EFFT1Ne/1+dNuvC15XdMS7tsIfdOqeaC0mWLr99aXa+Yuec3L+6SwcO9dj4rjtf/CUoHGiNCDgNHT2EYrCGGzAkadq+OvL4RYkkC2uXiLXb9fhP0DB8eTELDi2V1q4s/4U1OeQSg970Ei2JbT1iJ6zEGqarTrls9F02nnEtK/u5Au7tJQBW8wDWwV8g0EwxoUtrW0QGKpNKD4hP3FtHeVtJsVmQEMWvtW0afdhgZOdwe/S92ObiHtOssAKtYM8skmXsr9mtJD1My+hwl79XoFG0mF+toEXqJNkMME/clKPYI+EcpH5mh4GT1B79DH6WLNZ3caKoxzoAiVI1EoNIutO51rAGLjvM5FeE8YnDQkhnnpa20+b3OKui05bqE5hYAbBoRj709HzMfXY4Ox0ZB4owgmmJ8uBF3icgZVacxqD/x0Gu3mJKn+I2exYtK9zcy8rN2M0FHDrbgf0l0FIH446mh1M9PuK7tcd7lTDTCVr7BFtpJND8ICGttp0r8XchIJ0QO8kWB+sQzc71Mv/KeojjapezZ44nLYdwBRZHAhhj14WQYGWMJsJn76HrS8ROnQeOEQUj5/M8QxtbIYyIOzYgvQoLuHa4AQoRO+BfaAwkVO2UzfN5Tyy93IyFlM0aidcoz6AhbrqDkEzRrha7i0Sk4HW/MGySWa5mXvyO1HZksFW5HfQ6TqPmGc0FTvDt/VxDpAD5MAg454KxUxSvN8jzlbPQR59M3raZTKv3s7T9AUNQqMz9PbRTgKTUok5a6sHWYYXNnbxmZzoetzRIvzBb5cZiyKDSbc01CkuqGrbnEQtVAvgHfe6bDhRUkbU1DDriymbdFHTm+7tgcNKE/8VBkGOvGVNHm/5O4qu2/W4eIOslqePjxZExfLkrHnwx7TlfoVPvyg29USZPviDGwln9WDKscJ7qVByyVygoooGu09An2K8HjTWPNBG4y6Awa6Yy9rq37zhv1E0NQ1sfpGLhHBnXa/f2LbmAXv+aVdvBwSkNIfXcJu6M4cpND1fQ7jZAYhOv1D2DSd+YgijsEloFeoJHBQhvJ1ARwXglnZuQLmrXgID7AlxdpQUHLcH74XZlugDbGtPl50hIc789omt5ES4YIjLJongCQqlZH6PqxVmTVK3S6Nuvl2CMJXL3tAwm9JeSZq2DQyLDHkrOZ39GiXwKGbBFrhtl2qoFeb8VQ++dbBkEofGwdnd39fJ7u7ZbFe/BRk9e+SgAmL4wFerjaLX7i9oUbJ9p92lIYnL5kma X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffa07cb4-462e-4b38-e79f-08d973b91c07 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2791.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 17:41:52.6839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: keCaiJUH06K2frCW99Mol8gQeivLMlN3cA2QveZOubmT5DHt6X8BKMeoWU5Azi+ovowR2SIBfb56C8NwhlEHrMrmaKZ19rZqg8jmo+evRPY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4321 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10102 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109090107 X-Proofpoint-GUID: U3Zgt4wTbe6nRG6hTtBP_KDGIgQokfUj X-Proofpoint-ORIG-GUID: U3Zgt4wTbe6nRG6hTtBP_KDGIgQokfUj Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Move _scratch_remount_dump_log and _test_remount_dump_log from common/inject to common/xfs. These routines do not inject errors and should be placed with other xfs common functions. Signed-off-by: Catherine Hoang Reviewed-by: Allison Henderson --- common/inject | 26 -------------------------- common/xfs | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/inject b/common/inject index b5334d4a..6b590804 100644 --- a/common/inject +++ b/common/inject @@ -111,29 +111,3 @@ _scratch_inject_error() _fail "Cannot inject error ${type} value ${value}." fi } - -# Unmount and remount the scratch device, dumping the log -_scratch_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _scratch_unmount - _scratch_dump_log - _scratch_mount "$opts" -} - -# Unmount and remount the test device, dumping the log -_test_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _test_unmount - _test_dump_log - _test_mount "$opts" -} diff --git a/common/xfs b/common/xfs index bfb1bf1e..cda1f768 100644 --- a/common/xfs +++ b/common/xfs @@ -1263,3 +1263,29 @@ _require_scratch_xfs_bigtime() _notrun "bigtime feature not advertised on mount?" _scratch_unmount } + +# Unmount and remount the scratch device, dumping the log +_scratch_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _scratch_unmount + _scratch_dump_log + _scratch_mount "$opts" +} + +# Unmount and remount the test device, dumping the log +_test_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _test_unmount + _test_dump_log + _test_mount "$opts" +}