From patchwork Thu Oct 7 00:26:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 12540807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C6D7C433F5 for ; Thu, 7 Oct 2021 00:26:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 230FD6101A for ; Thu, 7 Oct 2021 00:26:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239961AbhJGA2q (ORCPT ); Wed, 6 Oct 2021 20:28:46 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:47220 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232398AbhJGA2o (ORCPT ); Wed, 6 Oct 2021 20:28:44 -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 196NwfdJ019759; Thu, 7 Oct 2021 00:26:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=u1PT8DASiNugaQHTAdveoXLxryponcwOL4FG9bLGq0s=; b=kKbAIEtRDL0IG/r13mHOxmBPVdxG0W06bCrKvLu4w6sKyd1dUuSudFe3Z6qiO8Fokpgr ghm2bwePwY8xBpY0+5EPhJoGlKbEi9tepj+SW0UFt0w6wTVJp7td3alSmJ2XN3Tt7fdp tED/4Bjlg85Sa3w5tLP9pUG3ZZejMxorkKOAXcrXKSNEiriZNZzKw3YlXsf5I6RyTyrc 70IFiXErI9Az+OGUHxcxeGpbENhvR3RfoRLXmDIJAlrCEjv381gLwfiKk4/uGpuA6tQ7 Lj3K4DfaGupw3VobMfmwhdRKELAdjXa4U9lcSs6LPVO9XZG9RYrW4bFDJtPAdnDU5wk6 rQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bh2dnqjam-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:51 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1970AkGC192858; Thu, 7 Oct 2021 00:26:50 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by userp3020.oracle.com with ESMTP id 3bf16vya41-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wegl5Z2Y+vPFpXI07VnMUNZJlBTIZOwnYAmlByVZRKC3T04rJZILYlxjmGg7B6KmLxMEJ6u1qcehAI95xu5b28xF0uIUUfX9P8ifbxRznxjM1U6ymn4eZUP9zK/d2zJto8A5VbcNXD8TK1rSCWYEVChCqFqRFdK/qiOJEVSwe7iOEKijgOXasJ25J32tpBGW0/DNizMOCSdPxRpAErqQ3CGdoVLbrjqfRXFqEbrQFJH4ZkzESkP94NNhwUKrZhItkjqMKh6tiFEaDMKl1yAhPikU+MdCsmd5cTACA5ANYNis/IRxLB7/o37/n8iavg2XTxSrDvfjSxGiX4u0e0Q6+g== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u1PT8DASiNugaQHTAdveoXLxryponcwOL4FG9bLGq0s=; b=Iuu5egQt05Oh3Z/JS3UbRQbqJvsHs4hGAFRzNMNlbYheDpRTqvvxRhkLU8lFbZy/vgxa78u4MVhahHTvmfuUShPYbTLBhRLYQvVNOcYUjM+CEr4cosa+f/gHv5U8fKhU9P/StMTupEYugLXI5sUc7bVSL0ZpTk2hz0dK0xRRqb/zX4AeLjDtF3apmts32DDqVuMXQmnejLWW+/9DQjbdUAH5vOQ9ka1zKBr8b+rYZ3ankDpU1Jdr4uADBqvTii/LoFwMwAVWs3a/WE2uhzZxr0LXDZJ4B0q9Drp0Ed3oPNg504c2dg0z6ZAZTefE+qGFOjqXKnNdOTWmMr+IY3wBcQ== 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=u1PT8DASiNugaQHTAdveoXLxryponcwOL4FG9bLGq0s=; b=ZvjAjeZAmLwmvkQi4wVHIoSiUR5Z1fsFpI5tGpfZZlNcGsok4FRq+BI4A04ucL6qFetF2P88hdrdkbVbUNNbnZD2BO4JyENzimqmH4iQdVDFZy1qJrMYiAA5A7e2ZAfeQ4IjFqdpMzjTEU1qjJtyKj1n7bfkcW/Gzrcwa5t9hwA= 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 DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) by DS7PR10MB5118.namprd10.prod.outlook.com (2603:10b6:5:3b0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 00:26:48 +0000 Received: from DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72]) by DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72%6]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 00:26:48 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Cc: allison.henderson@oracle.com Subject: [PATCH v2 1/4] xfstests: Rename _scratch_inject_logprint to _scratch_remount_dump_log Date: Thu, 7 Oct 2021 00:26:38 +0000 Message-Id: <20211007002641.714906-2-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211007002641.714906-1-catherine.hoang@oracle.com> References: <20211007002641.714906-1-catherine.hoang@oracle.com> X-ClientProxiedBy: MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) To DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.9 via Frontend Transport; Thu, 7 Oct 2021 00:26:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e78e443-f326-4a60-e1e8-08d98929264a X-MS-TrafficTypeDiagnostic: DS7PR10MB5118: X-MS-Exchange-Transport-Forked: True 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: daRuYYJ9a264nVQLz1p2bZuEu5RI1k+yeifUbsYm4In+ehBbisXgAKB8aZFD/Fd/blYZC2p/pbNI8RRWMNGi9vmMyumSkOeVcsBjz7/RrDHQdEigvpjgMIXRVvMe8+/XLNxHyhIOTRkMbIoSadfhC09IvWHuCBdjUaSC3wxmTU9zR+iAJZGh1lBijxDE8Eddz/UurvyUN9GLQPSmoGJU8zUtVDa40eJaXb2IodeWjp7bB9cb3zV41cxsPq4HCkLC11cjhAiWPCortKgigJ2tmvTABF1Un2VJd80CL5jB7TJThW8OjJnQb/XC3k+XHhmH49vei1A3EaxboVyc9QhevtOrB/Mq3sBMLRypgAc1S7E0CBJVpNnCqmA4hkaYHZ3R3AVMA4TyA827GymDW1lhP4BHPJeiUGdup0Wkw7EEfjxYBEJWJEAujiCXFcUAlZVpqYPDX1f7poj8s+Zd8XDzqbwqnNwjznB/+elE7IysKa+Wbj8k3bXjY/95RHRuzRBKmgLeIt2syX0L1YLer3dauS2KkUJy5xYOkjGZvpWtygNDPoo2LNcu8wjYWiCc/6vjQiROJSI+WBTEIQ8j+9zuQbtnlNmNBFs8Anh202Mynadp1J0agqhaG2dNhujmZZinZUHHVzATnX1Ks8HO2PIGomACemxG3v4MdU7O5MFu98KEE819Sl5yGUjOW35pRyH1HsHoQMeuOh6zpzgzEMRbDA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB2795.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6512007)(508600001)(6666004)(38350700002)(186003)(2906002)(38100700002)(36756003)(107886003)(5660300002)(44832011)(83380400001)(8676002)(450100002)(316002)(26005)(6506007)(52116002)(66556008)(66946007)(956004)(1076003)(8936002)(4326008)(6486002)(2616005)(86362001)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VIE79adoNWjIwuyvNot9EHcwNucqgVS+6fLA1VVjXo0qxDutV3vCouCiUOW9tGIwm7S39k7Jc7BTnDJFHWvdzARbFjEClEjBlN280wYwTNwgM15NuH9Mj8ereTDS7RC5eQLhEhpO3JA10jbdBHqAkYIjqk87gsIYVnacbOkDIdMJJsLBUYiGu8qBiC4f01W4pKX13g1qzaZYijLGlr3X4Iv1i7hT67c79+dU0Vnc461nKH0Fpn0xI9wGWZxgWLSOX9NgbywH3UnM1kJ3V1EwuCc2UB81y6ruuW+9IsXFS7HjwtS66PKKqbqF2l8YYLN69RRMcxoyNNoUz4feEhHYmVPzA/vQv7Kqrb3cVp34Zfy7DircYvzCreRQ/qF3KUtIPibVbs7uXCJYY/Z8Y0jqpfeUQ8oo3ql+FzFiYCB2b+aZuamt4JeLx/IRzYD18xmygFgweHL9EMMLtbfRvc/CAGlPMCBoR89jTGwEsAOlrMANOdt3ZZ1XHl4yOyo2AUUqE/zZUcjWms+PI4rSEZZYVXtxDxUpQCH9Hg/69wWoSrZEKrTKj4vxCUqJnd6kB985sxPY5PVUxZ3Jci9lOnPQSjvZSIXBsNdmKIUYeb/9SUOoPmB1nYSrmDdBd2ziYT2rx2kHtj4pFeMJIAyiXwqLLEVFcNoFOXTSgzlYoxV+xopjVMDnN+OLGC85xKuUQdjHFLHnCE5koeYHDUnPOdGgG3j9RFBhXhoA232uyKKfLTWR0+FZv5L1JInLGdRLcT5OWqM8ESakZENE59jw+XYU2+lmKI1dh/lf+nyFZqEZhzRCt1wbx+Symp2gdcGYvlAsQPJv2DVe9dgyQvuEsHVl0bMWdOjjnrQ0Nc8JBCTUx6z9ArrG0gwlJWAK9GnESB0y1Irg3vZ8POFRjtNEgty/cl37kzkSHjDhz0KCHEaoXgsS3bO/gB8ugrqIvVceqvAcuXC92EGuq1+sqKsFziZAHbUNGyDsZTxLiIf35W5SC2WjHh3o3pxYiuUnRn25rE3GMtajRwB2GWS8fgK5RmqQ6Fz5h89GCnaPMCT0sDs1hYoetlFX5JzMjqImZCAf10UmUDpg2CfawXXNpI5KizSLUtS+AVWNFPQkv91DOrkUgBBBCfm9ZVRcslz5eS3NBd+0X/DW1IeAW3QiOUjHn7XMa0OZsO50a7cVSr7dCkn7atTWk7KuKy/3y3AiSUDg5yBuoQmzLIzgdp0N9UPk5Gqkr1+BDJTVu5D9+HVbjMJRBs7mjSUk6NzfdkNKRWCnpRxyUMB1N5yNKAKnpQexq248PKdNM9XrfDtFaOG7+4NTvWya9fiod7nPTiWWyFs5M2QT X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e78e443-f326-4a60-e1e8-08d98929264a X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB2795.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 00:26:48.0860 (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: N3ygwUesXa+9z+qZigwnll0kCi79DTZYoztekWC0HdvqoBFtyOnonOp3aRnMCBBLbfXFbfEHrATY95t/Zo7u10TqGomYEPOonnOc6GUDFio= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5118 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10129 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110070000 X-Proofpoint-ORIG-GUID: 7MQm9tgOFGmQFohhc-70RbddKm9voebj X-Proofpoint-GUID: 7MQm9tgOFGmQFohhc-70RbddKm9voebj Precedence: bulk List-ID: X-Mailing-List: fstests@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 Reviewed-by: Darrick J. Wong --- 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 Oct 7 00:26:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 12540811 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F24C433FE for ; Thu, 7 Oct 2021 00:26:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FD38611CA for ; Thu, 7 Oct 2021 00:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240013AbhJGA2s (ORCPT ); Wed, 6 Oct 2021 20:28:48 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:49574 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239983AbhJGA2q (ORCPT ); Wed, 6 Oct 2021 20:28:46 -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 196Nwx2b019750; Thu, 7 Oct 2021 00:26:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=0CmXZTjura0u5CgXkrxJMT70/ilW8RiGxkEmQEMfjy0=; b=wN4i8Ny7irmfA/Ad12TxhMGue3mGWI2QQO2CJMjQzOFPo9ImTlL2iugJJKCR4w8sf2Pm f4Co0/YS1HLdm6/XE0rp//c/ElD5gAfdb9ZcEv1EBh3535cbYmOh+HUo1SU8BztLmDet QBHBwHJ24o6zYslPtzKpUQfjbtoBCT37W4r7+l2QAYHo4usDO8AL5YKDx7v209ZDxhWj iKq4kSsO2CI5lCHp4YPbn/AGkmJIaXnCU7A8LcVZSTZn6sRm5OB+6QHbAmJ/E3zcG3br CUfz5xKln7MSuOnjPS6t/Z6QfSecu8nsgBP3LqXERqaa2gZvrjYrgSzshV/fmf+bAJpA pA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bh2dnqjap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:52 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1970AkGD192858; Thu, 7 Oct 2021 00:26:50 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by userp3020.oracle.com with ESMTP id 3bf16vya41-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EhMpel9gViMtUeaMhXcAAJV49WW0JaU5wFjycFKvkikD9ZKpYo3xGufHK8fFhWs7wU1ZqbJd6FdtMI0Cpe6XTZ0oAWKcr4c9+kZ8rUSpj1avwYcmC4ms3lxM8cf8tO9UVuV4Wp/mhH6l3M/IhKzntvgaGFWbk97tT8WdvatDnI2M5qLvscAmvZ3QHBOWegR5fxwV97udYANZNOc+ex61SyKGoJ/wAu8kZcOMKEkvdA6ZizaexTqUPFYk76TSXhJLh+wjxx9zH1nPI0daYLES3UfMauExahmQK6X4cLaXuBO4HrhhMwpNW3FFrwH7zy4QdnsYN8S2liKWASRoBmdFbg== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0CmXZTjura0u5CgXkrxJMT70/ilW8RiGxkEmQEMfjy0=; b=dEStN6JTskMW5S8BQdiBKK9t0pz/EknswKfLiaOl6kvKcsL1Rp08Idw2loVYRYovVnwMND/6gwK0F4dUxkNX+mjxzRBuY0R6aXqCTp8WNdJ3nnDf+TyFoMZxF7yHiJFH/wz68Quu0I0MddUE7YH6mm1Bkvit6sG3XEN/Z4EjvMdz4JQ3+iqNLfLjvsst9x8yGFMo0J6dyTaVNZwb+dAj/a6y+2km3OGwxDh4wNNXJv/TMfk4OTb9aMNfeCodkguAffRpHvhSAyTgus/crALAeA0ejG3vOhWKHSrowMXVtqejr4F0wTqBcZqDCtfH0rFnKZwlt9gK1t6IowcBcfzggA== 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=0CmXZTjura0u5CgXkrxJMT70/ilW8RiGxkEmQEMfjy0=; b=f8cyv83HccBl4ijA5ahXLb7scU+Glf65z+tQ6u0BikIXCcv4RnI2rpuaC80AprTJ1HpSL80oK/2kRCRYp9GjfFCdZT71I5a+GjbZA0xqVGJHlLxF3+RAAKDJCeTLImRdvZLsrgXmYRUsMM0L2KktrL1Wz1E9ei0p9LjbJFBMlDQ= 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 DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) by DS7PR10MB5118.namprd10.prod.outlook.com (2603:10b6:5:3b0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 00:26:48 +0000 Received: from DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72]) by DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72%6]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 00:26:48 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Cc: allison.henderson@oracle.com Subject: [PATCH v2 2/4] xfstests: Rename _test_inject_logprint to _test_remount_dump_log Date: Thu, 7 Oct 2021 00:26:39 +0000 Message-Id: <20211007002641.714906-3-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211007002641.714906-1-catherine.hoang@oracle.com> References: <20211007002641.714906-1-catherine.hoang@oracle.com> X-ClientProxiedBy: MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) To DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.9 via Frontend Transport; Thu, 7 Oct 2021 00:26:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee2225bc-7c16-48ac-e0d0-08d989292699 X-MS-TrafficTypeDiagnostic: DS7PR10MB5118: X-MS-Exchange-Transport-Forked: True 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: daEAKlObEdSMewq2fUyOniBtqdInAR/t8GaQ0Qp0Go3r0SCFIkXqok8Ex0VXO0bfkx8TurJWli1prmNCL+Yw8y5AMuFFFMCNQG82l6vYQsqZZHMfwh7/EphC/wrvXcQ1S0VOzAL31oWvYk0dzH5TFNftobc4oKIc1pda1e1ZUP0IlivMsYy1wjujYq5VU8qhjvkyUPJKhbSLvwT1NryCisVwnB/i0I2l3E67qgu0pvgOJ6JGygG/26hd8rE4V0oGPleEWzI7rzLenj9f+GBl5wRsbSp2oAmkzGRzBDSPnOyvD9H6DmJneK2165TdDJqCKLM029LnjH634/eWt5Wm4AnV/chyCGNpIFZhx06uzA3saWBesdxcfsz/vL3c7baQG5N/HCWvKlpBWHtyBnszG8twmbpekSrFhYg72137r8H8W0kLbu2rxcb78jc6np5dRrYUXDrhxykCLi0TCw8S/i2GZhIs39pv+Xx5PjolAqrqjx444CyEs0YXz6VGby1kGUlCONyKdd1tUgCheBrTFbgDdSpsOvRe7X1lbRRo32B52b6251E+1Exe6CTTBb3sjv8ngGNjvirCyBNuN4T7gr4OcI1vFoajWnRyAQmXxP4dvINGg8sgYrhXy+YXTJeC28bAjTWBnjRemztpKb+r1NRetsAZVoxuVK6GOW38IbERzg+PjvmdF1wJPcmPUYy7AgVeO6QHkZ9xo7SvW+G4qw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB2795.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6512007)(508600001)(6666004)(38350700002)(186003)(2906002)(38100700002)(36756003)(107886003)(5660300002)(44832011)(83380400001)(8676002)(450100002)(316002)(4744005)(26005)(6506007)(52116002)(66556008)(66946007)(956004)(1076003)(8936002)(4326008)(6486002)(2616005)(86362001)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1GGuokqpsRIoJ6GOubIvjENrBpcri0iVMaU9CNdjMAN7VdFEC3pnmRzNxbVeDyQ9+wDsyD36htbvaKYTL6SWR2183fO+ojENbNQUumNwJmH8TKHOOgTzSJja+TNxyPIUuh6yxNfCVzXWCu+AdrAsZjURMSWimH0RpjxkjnsvfCRc8++hWfHGdDvOE7FYOQfDoVCoBIXPxDou/W7tWXlXoEG+IHc4h3hmgfLYnga+c4dwYVCg3Gd+5GvvVQ9LeBbUC4kXvpBvVRZ8t6VblnTfN7rjZiSgr7CPh+zFKFYFZJqOwKJzwilgZLLUzxogKSUPZiyVU3EP9SSOL1CdQ6M0Dhk61E3l6vbXWX2l7Ztx/S/pHzAHvND4KImTQgFfStgsC7I+0MVLDHZgGKgXHKQJqSCuGJrbeJPb5OgWyzTYrrrAxQmSK2xnoxqasj/d0TqZjECb69CsR50gBUzG1xs3Cp1+xYC/KwtkvRwcHRmM18MLamuFKE976SqZYEotU7RXOfFUon/swZ7tEkgzff7EJAGYFys6YFKr9PttDVgoHXPXCkUxWIWwRb0DHUtfZjVnPq2c8CQ5ODDcugVwkAYHttXyZP6Ut75xEX+BsN5RWM46dDm/HnOw3/hodlmDIsDi2nHH7mcWRC3TFyKCFvn46JBEfv6VDK2yZfGH325/8h8EZ/kFdahpcjAQuXLusJ8waEgAHXRvp6xAept7L0JaX5HxSw3WF0y+tR87tuGGfwc4CNZ8X1R9hvhwT38uz9mQd/JLOgAcCHmA0SdK7NuMgYiYGWbkZhMsDi62oGGJLAbEoJ8AxM1x8dpvL+2nOyTPya2nuSP+9DdBKd0ghUoDQmq3ixOElOxqJCbQ8ULkFxDOxGgiNcxuMUPwYVjsYSk2Or/AriZf7ffwT3zVEnz8Z62msiCzjo9L1gewh4mbLVX1OUGX/j/TFnC1gLRyNPdz8cbzImAPKGt/bHQAKKDlB+ov5W74jFt6ADHAyWqM+omvlI25e10NONBxKkEdapBNGHf7MoXSeBGn/TdLyEWuSozRmpmh7dBaEKuWvJecyFa/qWUtivFRIuFu1A+029ZFpct+mjes7MVYjL8emJuFJRGdS7jE5xwBf7jXBs6sImG8im5PLiCnNARP/IUedmp2mq7VZAuv2OrgmU0ZDPa64ig4zbxOFpZAS6GcIjtNgh0ZB1cN5xRsrhvQoXAuVJ7bwX96vrn8jz3Tbbq6bhawfofE5ChVQZnxqZsPlcBHA648k2UGT6cZZFJqulLbjmYFZQoxPpfJZ1JH+OobYsTyZn+SX/XXlo4veBmA4UW1SzxoqP3OEskmrpQPOa4EVcdw X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee2225bc-7c16-48ac-e0d0-08d989292699 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB2795.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 00:26:48.6227 (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: hB+c+56RTrAIFndQ06apXHrx4DWx7ZhGBufPBf/ZE3k88uOCE1/fy1gf/WxCnZv+c+YytGqPXEzKwiKS27C1LeJKU0/iNirXPH0i42yyGRI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5118 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10129 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110070000 X-Proofpoint-ORIG-GUID: cZVWWBFFfutw4ByYQkq6_NljbXywTiJj X-Proofpoint-GUID: cZVWWBFFfutw4ByYQkq6_NljbXywTiJj Precedence: bulk List-ID: X-Mailing-List: fstests@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 Reviewed-by: Darrick J. Wong --- 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 Oct 7 00:26: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: 12540809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB563C433EF for ; Thu, 7 Oct 2021 00:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D193960F4C for ; Thu, 7 Oct 2021 00:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240008AbhJGA2r (ORCPT ); Wed, 6 Oct 2021 20:28:47 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:49292 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232398AbhJGA2q (ORCPT ); Wed, 6 Oct 2021 20:28:46 -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 196NwfdL019759; Thu, 7 Oct 2021 00:26:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=jSmguiHjrsS1h28uCJbJ+KgvbDN0ibjvdlNbPRW8uYQ=; b=i36dfPW0mHaw0uuDTGYUBp+ufhsJG6ssaBB+UaErbD2KcMZjvpwK3h601C7HxK5chuRT gNSkcEo7ltvcJEAvSVd/UuvBy4iViaHviZvNBLOLqKkayxV6AaZ4FVRwaGLXenltH2UY JPbJ1fwFmk+hUhyPnAfsX2SSiB6pdPpzVBQxVbZk209TSDeqm75FLqE1Km9CweehjZeY RqWl2zoNRMKWLVnFCLOUiqHoMHvj2AAaR0P9mxVmPymPHL4dImvcGbYqEUwoy7lk3GfN TvVakUAKEeeS2BS5+TKpf8fGKgZwbuLVktT7XBcDwOgNONwhT6oxl7r2MmqsbeiQ+WEW wg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bh2dnqjat-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:52 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1970AkGE192858; Thu, 7 Oct 2021 00:26:51 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by userp3020.oracle.com with ESMTP id 3bf16vya41-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SRpi5m1py7kNnlHnWvI2AFfDB7EERa2bEIAUipI8aGseq0yBTUcKVXnfcV/O7OGy9WG8/o7wZpqIsqseupDsOMKZBBRxkTtdPR0iRFH9L9ZS74R3KILlW53xAL9l4MgtgHhtQyUA5XBsifsu+tBjPOHOuZ+M3OWDSmzZ0+2vShNMiJid33MoqGVL2xrWZOXU3rtBHIv7q8r1vIfKAMLU5h8rA+Bc6Q7/lTpt9KS1i5F4A/U4QrZi4X1cnnS3PidIIJHyvamiWZg7AHBMTpW9FUwnl3NHY9vtyfCFsMHMBteNjwnrXxmt3rYLue76YqZtFsOrpS8PCSCudXz/sIsDZg== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jSmguiHjrsS1h28uCJbJ+KgvbDN0ibjvdlNbPRW8uYQ=; b=OlfVgiVzMbNTBZUQ0vX6e4Y5q54hLamz4mJcLi7aSLKyx9z9PPAe0htJuNtbFG1YL+rjR4NbWPE++EUCmxuMaQYGeji61OCLaQWlg1JAcdliKHsnQREI05oRjCdOwiCr4IxZ3dim6gnKOFVzLBy+7ztMFrg5+eu53vawjm8LTDLXYtxV3MlS1SG22uy2fGMJuVhFL1Q5dfnCh1v0Xa9pOqPVxOpRWxjqwwvSdL4pKzhuHbldDnlPLvOBzoj5j/x8bfoF0fKRSFAvZZrVAybNW+nV4emDMRb5zslObD9/i9Vfg+nJYldfdCm0gAcqf26luKGVtVRq4SyZ/zESL8EQZQ== 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=jSmguiHjrsS1h28uCJbJ+KgvbDN0ibjvdlNbPRW8uYQ=; b=tiaNX2Eg8JKPLAHsVvPQloreXaPCQiVfvQip9xYqp5sWQfI1U7hnAEMojyZhNbdhcTEWF6v4UT5ZyoEA0PSEumCD0nBbAKV/ttdOQYjc8X3VypW4LBOCEhKGPo4kmX45nDTcPliOrxcN3TJWGmTnl5uzeUmge2x8KdBYz0t6/wo= 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 DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) by DS7PR10MB5118.namprd10.prod.outlook.com (2603:10b6:5:3b0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 00:26:49 +0000 Received: from DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72]) by DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72%6]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 00:26:49 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Cc: allison.henderson@oracle.com Subject: [PATCH v2 3/4] common/log: Move *_dump_log routines to common/log Date: Thu, 7 Oct 2021 00:26:40 +0000 Message-Id: <20211007002641.714906-4-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211007002641.714906-1-catherine.hoang@oracle.com> References: <20211007002641.714906-1-catherine.hoang@oracle.com> X-ClientProxiedBy: MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) To DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.9 via Frontend Transport; Thu, 7 Oct 2021 00:26:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41024fb8-6e88-4a68-24e0-08d9892926ed X-MS-TrafficTypeDiagnostic: DS7PR10MB5118: X-MS-Exchange-Transport-Forked: True 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: 6OOi8Y2MVWfMtgsAhaOO/n+tp0xST6b5o2+3uwjACs99Ju0ABcXOyrlU3yk+8onXA0QQpfDb4ZOCZ+D0BI+aVP4NBTEjZplwjl4e1AmGy3U+MqL9ozZ7YtYx0QZIlgWSz92yisaKQkRAp6W/uj3VsEcyWVj4FL157VzJQVOR+8ww0RvkAMSVJLLJrYrFp3S7T7PAYNLWkn4YWZiMpoUZpqXbqSbH5rFVfpjFgnpVxIcpWu9eO78tfhK4xMZZ5UL8Ex1iG0iN3sgqSUc4vn/hMRQhPZhw7617DcL8uQk2wUDnIv1FcnTuPLFx91NNtQKgqz1eqmQTxDvAw93UP8jgERfJESLq0gILLsnkIyTfyTQzKaJPlaeNb1FX9ljFfeeoaJkRhXbI0TVonD8mvqfyZWH0JIazS2ecNYZbNnbAH/bAHIqeyXD1ir45h64WD2qHh/V/2TAOjh6y+r39MOKJsrt0zbnoaAzVmlcIwhzFLv2WqcOKEM+UbBVSKrintTMjfnXCQ6j9l9sOPw8FaT79Hefj/CtyFssJnIC6bwGI5CjARX/8bxfXRq3xd2Kq5upMN9rLd/InjAc1xlbAOq2znaMn7lt8gDUPbym29AgmO/qbmgcioK2v/hxfVdR3rSlnvWQEUjVuS+VecS+OYCijARN52JXUqurmRzceQr8aGY908PPVXiF+W3X6ziJp0nL1GrRDD7l00lGK34ITZ9wG0A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB2795.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6512007)(508600001)(6666004)(38350700002)(186003)(2906002)(38100700002)(36756003)(107886003)(5660300002)(44832011)(83380400001)(8676002)(450100002)(316002)(26005)(6506007)(52116002)(66556008)(66946007)(956004)(1076003)(8936002)(4326008)(6486002)(2616005)(86362001)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: akwWJICo+ILF6C4uVHUmtN3xQzmSFh3zOUEPzWxdSKaCGqnLLIAnceak8giJ+gd6kRW53P45WASJbg+IdjlHDQvcelGEOzW0eFCBSMLBL4z8vmhI3qP59LCEWT+Pd4aBwuqDdkPU4OnVH00Y5MqzO1eSpfTKwx5LCCJNtApLDwUdyhfBc+RcQZUdPYLqW01McMWXGQO8vSp5keyVcbWs+/JAwcXnyo6/HV6/tEgN4CZf8uYGP6YcMjuRAAX3bqMsnjreNEcrxW7oXBNNj/Bo4oC0pnAWqKJGWaTR5OOwVNrWiWNAskdylQYEUwD6BOOptxT81ZV3Kndb6ObR98FYP/ePAzcTa+YLOSENp+cm96/mx73G9Kyaz5Q39gOC8JOGPNwgLJKZPGPr+BehyIAqkfX/vTV0nW/CxJ1IJN5L2J2zOkj8TShgWK1N/Ghphr3JjodmFEjTzmeriDu8d6Dz8ip11qjy63rUx+ftwhUE/hCs3ppEdzGoPk9XvJwI9EUXDEM4iUb2ko4fzOdrSApGS2q0DoReYxZtIfEBGYStAL8wXHD0+roB/82kCv3OZVEQj1LlPBKieBx6svuzwIp21leXmBWoDuK3Hx68zfE5KbVi6za+n7DsjTfn7z/cgAiD/vT2X9BBp6MvW9ZaKJeIqg9cZll2h1Q6r6K9JTOgxRemXPEtbPKj3a4RmyGj+bwVN5K4LgZZz7Gdsdctymp9t33b9ieqrJ5rhjRLnBui3ypxtytr+u5GhDACzG/Z5JGhrm5CwQQ64dJU3mXTpn1CvQaD0Ev3Cs2h92lQd4m3J0k2+CuZhY0e2qo+JUFyLcpX+z6RFVqYWAji8QKAMMlXij5tNt5D84DDc5R30Dns8rWuRUeHUXksYuCq7owmwe5H5b62eIYvX070PUjjrO18tR803lYqAlkSJgIjWOm4fpBKjXOVhpLeX+4mMOwZTi5IGX1X3WWXsub6n3nsb0IzNGOHKQyGmBR4OouC32tHMNrIm1AEGnsPQyiXzZZZSqgVS2w6l1F6KbdOj/vyOkLTurXANjCOBSHJn50EoCsLJU68/LqZGrhliEXR73oYjDkToE/LaQ1YHjsTVMi+LdFdcYBE2SuKnFMdGPRY4xMZlf3Z4fySLEBIGhV1UIXFZUllcbGTXbgd8omfLPbSi20RtiZNhd77OK3WE9bOD7sOW16sPXANG8WGvtDSH9aX9hTUYH5ry3T+9WBb6whspRVnD3OJyfzfMk9kFtAslqR/PR3UzsuhR3BnVkDOgMeFtQlXNjOFJIdcgVXg2x0KxxWD+SfneSYMeHdG4BkSAtTBYw770S6nfI+p333lKX3oGSVQ X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41024fb8-6e88-4a68-24e0-08d9892926ed X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB2795.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 00:26:49.0925 (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: XciglrzYFlLxVcriFUdN+TZkve1pGKc59qbHm+qIfVyeRaxg3tMjMaMvyq6Ll0wPseS0zyFOe0xsj+GAIy2Aezqwa5+WNwGBbNneufij5tU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5118 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10129 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=987 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110070000 X-Proofpoint-ORIG-GUID: xWc9W--ElLySjNVSSYbJqgRJmDiSXUVL X-Proofpoint-GUID: xWc9W--ElLySjNVSSYbJqgRJmDiSXUVL Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Move _scratch_remount_dump_log and _test_remount_dump_log from common/inject to common/log. These routines do not inject errors and should be placed with other common log functions. Signed-off-by: Catherine Hoang Reviewed-by: Allison Henderson Reviewed-by: Darrick J. Wong --- common/inject | 26 -------------------------- common/log | 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/log b/common/log index c7921f50..0a9aaa7f 100644 --- a/common/log +++ b/common/log @@ -608,5 +608,31 @@ _get_log_configs() esac } +# 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" +} + # make sure this script returns success /bin/true From patchwork Thu Oct 7 00:26: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: 12540805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 800D2C43217 for ; Thu, 7 Oct 2021 00:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6534F61177 for ; Thu, 7 Oct 2021 00:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239997AbhJGA2r (ORCPT ); Wed, 6 Oct 2021 20:28:47 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:49098 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239978AbhJGA2q (ORCPT ); Wed, 6 Oct 2021 20:28:46 -0400 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 196N6eVJ028065; Thu, 7 Oct 2021 00:26:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=0ZnV9h9vtIiM/oEG7RzZmaO3VEX8w9AX9R2HCPA6nxw=; b=qBSzKcZa7ObkguO5sHuyANj07O3wiua+OGjBHnvffsUYwzNT38EDgmJqvqLbnDP10mtP +Kzz01ONU6VpBCOgFRL3lcUYUkMChgfIGtdsyO0Fzt4tD+zgStSzkvbUip+LDrSAQxSD OA6p3kk3t122jmMMmOZooBUEsCjqHAPTaFWGmzByzbJ+u5Lz5c5zzb2hMTdUII4UG050 f9l9WTXIr0FvBsPemKGvu0IfrAx5PoBgPdTH5p5v/1+5QAisPE9A8Q/aLE3aTWS5n/u9 yIyXIjoPtJBmUi59IhK1SFPZIbs0d9BbQUwIPgNaBtKknoYertf38/V1So/6fgFY88zW gA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bh10gh2c0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:53 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1970AkGF192858; Thu, 7 Oct 2021 00:26:51 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by userp3020.oracle.com with ESMTP id 3bf16vya41-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Oct 2021 00:26:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OeSBCrsPl8IXN+4lQsyxdk69j/ZoUK+bF60DlvW04r6X75cNAPn/v6JHvI3GGEfTlyhr7YNLA7ub6LK8yUCqZtK0XUCJrWrH9jhckUDm2AFou80ykPIZOS7v+872+ZifJZQ3ZB+aOKyAzW6Rq8mEiJtdw3uIRhzE0Lqw6v6/+EhJ+NaIrAN1pEg3Xqqzb2xiCJ28IXgY5LOc3tN5xaEayszp0Tr6E4tqKxtGKST1Q2tttySMsxxeDz+gbDQ8K3fxEPVRYcdPyc6bewSxCj9blqegOExxAxGKcOoy0PxfcueyYcvS6MW2shpJKK95mu3nMh2qjS5tX+9OYCF512d1aA== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0ZnV9h9vtIiM/oEG7RzZmaO3VEX8w9AX9R2HCPA6nxw=; b=SQl3HVcwzYvjFyrex2oO+KIDApLTE7NmZLUpXlLOnyzr83M7E68wk1g0qvE+hO1radoM85m/0pgQUwHRRSxKcroRIezg2dhbWL35I/qSb8+fpBn+hUaOnE7HsRuZaQWJGBjhraIPZKCDVJla8soDDbCEvxQRm0QFMo/9BRKJ7obqqE6t9nHvH33WCKvtUrQs8Uk2hFiP7Q72iWj1RxBNZBXfYNJF53AF+uIzuK36cckmesTHFGk5Cq98UyH5i5BJFB/RuG0M6vtNLoIlfXh1lcW8QvleDdcsFJogPeUcdFRQLcfJmlfXeF9EiBGS8II/8hqmqX0bLThrDl1IdK8sEA== 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=0ZnV9h9vtIiM/oEG7RzZmaO3VEX8w9AX9R2HCPA6nxw=; b=jH7kaiF+KdCB60Hv9iuiJHn8gYWCG77Omd5DQ0ZUbQTbXOHxVvEJQLW7k/g+fy3jIkPeGWhW3Ypv70xJm8VZo5u+yYOH4jQUzsuu0gDI1s3kF87i8g3xtmN19dUXNSGxGveKpSbRyYMV25yEKbVcqP5D1DwZ7X+LkbO4YFD6nAs= 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 DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) by DS7PR10MB5118.namprd10.prod.outlook.com (2603:10b6:5:3b0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 00:26:50 +0000 Received: from DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72]) by DM6PR10MB2795.namprd10.prod.outlook.com ([fe80::a59b:518a:8dc9:4f72%6]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 00:26:49 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Cc: allison.henderson@oracle.com Subject: [PATCH v2 4/4] common/log: Fix *_dump_log routines for ext4 Date: Thu, 7 Oct 2021 00:26:41 +0000 Message-Id: <20211007002641.714906-5-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211007002641.714906-1-catherine.hoang@oracle.com> References: <20211007002641.714906-1-catherine.hoang@oracle.com> X-ClientProxiedBy: MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) To DM6PR10MB2795.namprd10.prod.outlook.com (2603:10b6:5:70::21) MIME-Version: 1.0 Received: from instance-20210819-1300.osdevelopmeniad.oraclevcn.com (209.17.40.39) by MN2PR05CA0019.namprd05.prod.outlook.com (2603:10b6:208:c0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.9 via Frontend Transport; Thu, 7 Oct 2021 00:26:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 594ef57b-87a9-4751-0141-08d98929273a X-MS-TrafficTypeDiagnostic: DS7PR10MB5118: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I5YPn8kdcJgiHJQSeYomYbgux+LKRCT/UwZKa2P++hN12tHjPVBInmCFhfcBVq9aV1hUelW2n9FEmnsxwRhaU0ezCloFOQubs+p6kJitoWyPgcOGJS5CLbZODfX7HxCjhbUsajlTXNa9MzDSZphUxV9/cTUPP2assSF3y+t/hbxdJd3euuKhcsb1oXdCMxxbbWukAHu/Y5W2LIYPAVrsBpL4q2rDW01Q8uMCSBBIbJtMxSR0qpRr8QuPFWP3n5iQ8FUnvl97iL1sTwwthAgkfo3EJnEfl3HcMy/zqJasw4c1xqpWSVCOHOk2vkKTFp0vV0H/qKyP5eZGHRZfSaBUfKFntPsVOlXn6+4edfMmMxZ7Rg1ArNMroCMMpXdboZPN6WpyVwNAchh5Fyf9p92QtWruiOWhxikIiQC/rFCnKnHErhK6wTXdXAWWRAdHqbCTCUn2CtUz061uCOmk9Fx+xVc3il6mqRctJM9iRS8t9K5JTEFiMWN8D+1/6fUWtCaKPWdCNjfVPeALJmKV1Ci8uca0A0EAH+f7eRq5qVMmt+t9QHj85DPgik2r/oFhWKvJG2ElPN8LpjfrWbKYQYCzPVjX4jg4JfYapeyrhiFdTZ6nkje8tJjglrs7Voqii6pB9uwqdg3YGU+33lG5ztsGGyooOtOsF1E0GpFEhhk3ObQCg1zxm0sNL7Ky5JsJCOA+8me12CWbAj3mbnzzSYLmqA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB2795.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6512007)(508600001)(6666004)(38350700002)(186003)(2906002)(38100700002)(36756003)(107886003)(5660300002)(44832011)(83380400001)(8676002)(450100002)(316002)(4744005)(26005)(6506007)(52116002)(66556008)(66946007)(956004)(1076003)(8936002)(4326008)(6486002)(2616005)(86362001)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: goYJk62yHcsmsffnmrb/MPsdwzwYZPfOtI8fXiSopHfzCnwb7SW6CgoqnjJYvglYfvogJcvqfKR2J2rcUUamGk03PryIZNiIYlT7vsB7B2p+XsuWFzXND2qkpBL7GXIGXGPzYNnba+8La/aFFZM2+mprENeR6ONeUJXeLJZpTo5TSd0BQ/zIx0ooOMgmywmXPiCdAL+vwfX695ZDWbVtSCmB2Y9utGdLx10XpBA4ZXuDR/ynu8N1dvwx/+iQ/z1T6q7k1aeVdyEnHrkxiu3ae9i4eGVwHM7Y9CV+f1tZCSyU8fgsjwFXRUmpWUHrHjU8j93jN5Mdbd5KSDrwobZkPA9TOl/9hPEZCkvR+ZBxn4RFb+0mVWdOl4pGw8OqsnUvfl4YFJl6Sr7XiZw2q58goZS+S5U+vbguW+B7Ajd/gAwOSQDOohLluw2/M2tQ+OS8FQwWoj/kJNZd8uy+IE6sl4bIGTfSfiHU+ahJ6JGTkSzJUw8NC+6vou/fpbizk7aM+6Hwq5P+/aL3XxI7A/0FxgCL3ug8/bm5VT7AYkVPAFwxtEM9w79MwibXO30x2PZSGio6T+o03umSdBm3s4GTyvSqr3bS/CwrC4kPCNUE5uJ8S0uVpZjYRqxZPt0hqtbmNgDM8yeTyW2J1982P1Ga8LCrz1B/K56wW0J+T5xoMIYdb9RnFy1INeowiIXztufeHdhwb7SIx7zZBRW/1kykv12sfdMPEOZ5TNpfhlA8wu8KLH1eLjl6xAtoHhIwFE0DMozfZvemTBn1hSXGhqKO0gKXoHi1sRKX6V0XGBZc7ViaMs8xU1xcmjjfM85i3/HJ9QXB4ZtzYKjsHZ8Ofy68PxKFyUeAs5ibrRQFfQRPQfS1LfC5SYRhcdpqDLIPVcAyrD2SSwO6hdMQ9NmNAzHuSewp/U8YGgZlOqWi03j+pPveGqQj2ZXBc4jtkCW6s41umB6tf8PkeKxnl8VhCToLUClXdrzWh3Vro6e9Sz312PoLQ8A3kTOKU2BWlopGVpBrK76e8HaPrp4tZ6838Fu8v1sg2l8ILO6V4wsDuM4eacDkN57X92df21ONGdmNnlnLVT2/5Lhm1XSICzBT4sMLbilo6Rgt7QKllSCmE88kRpwZuci1VYggfxHWs/QKvgBZRw/nmFFf6ClNkcHxAQH0KhVJSov+kKykXRwdoWKtoyNVQ0/f136Fk+UQJEpI/xrzyZnH347eNGkvqFUP9/Fij9CWVay+4+/GECa/c1vypyENEMAt2iJjYX4BX2lTwPDtioCSn6Y6rw1gb24DzYcQS6fSScEcrYxMDAs0QU7Rg5/G7Md53+WexZs4pEUz7Qf9 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 594ef57b-87a9-4751-0141-08d98929273a X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB2795.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 00:26:49.8850 (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: Ug7RvKzwsCLIgWZ/ek02MdVYvZwjTXmC47jeMuEDXeOn62G0DQGQwvtbHqOWBMAxteip0+2q1KfaXCEIgNBBqPbm4wFsCA+CtmTmFORfwSU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5118 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10129 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110070000 X-Proofpoint-GUID: Sqg3P506kVCsqOWxVh_h7uYpT4wBFY_S X-Proofpoint-ORIG-GUID: Sqg3P506kVCsqOWxVh_h7uYpT4wBFY_S Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org dumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal. Signed-off-by: Catherine Hoang Reviewed-by: Darrick J. Wong Reviewed-by: Allison Henderson --- common/log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/log b/common/log index 0a9aaa7f..154f3959 100644 --- a/common/log +++ b/common/log @@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEV ;; *) ;; @@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;