Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp472550ybb; Wed, 8 Apr 2020 03:46:20 -0700 (PDT) X-Google-Smtp-Source: APiQypKfvdSRDurrdMtQoS0EVX9Sbt4nIUxzzTQzW5HDkoOl/ihXGn/3k55VYrwzuoLYIihHuQsT X-Received: by 2002:a4a:874f:: with SMTP id a15mr5409760ooi.8.1586342780417; Wed, 08 Apr 2020 03:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586342780; cv=none; d=google.com; s=arc-20160816; b=jMXy3JbAlG+XCCq5jbBw825xpV8482xAhMhBl3iKFt7I3LR2ehvGcvHDCxBOWz9KJU yM4X5SyT/VA54OtMXwp+xMYM2li/1gcyN4mOcxuPUfEGp3cobKQ4gB9diTpWoOBmtCJb kG/cNcqLXgDTf6oggh61w7SLnIRrcFiugoUhzIIuN4PNif135+516BhAKsRunsxprVbu wJ4iXEh6mGSju2lgS1qOEb9WrYVpl42f4uU6ic6Zeab1PEO5DbZTRCY10KUwWpdr0keX WguItbg0GbzoA+vtDZvoNV3RdxvV0Gg6L0tojgx4kA2Z1Lu8NuMIk93wdFrV7dFugd6R MMVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=xn/9gW4cVNsKY+C/0Cg/50ED51EAz2uYRVZSESOP2rA=; b=RO6p4hwEWhTvT81OyIFMbn61yDdd8Gmtz5Hchb0LUjLUDgetXZBnVeSkBPYc0Mnust CGDGRDllQVxBpQYHSP/73YUFtwn11yN3g2LX1FT6TtCRa4u48DQH42ByKKigkv1O4r3B fMqV9mAd6gBu0XblQgvfPWGnaaDOf5w/OEx8FeorVVMMc6uHkK5ZiNoS0X9aRzT3y/d4 rXgtwLacsBqD+LoVQ+YL7Gv4KZrQygFBy6sBnFccQ8LIwyxVv2d2KO6prN933Y3YHlL+ ZYXmnmpcxFA52O6nZ0TmODnAHDjXvVez0LMyvTG8SaivZxDGvclYOu3XHqVsFItO1z6O Gffw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mEKVhFw9; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q4si2410301ooo.92.2020.04.08.03.46.06; Wed, 08 Apr 2020 03:46:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mEKVhFw9; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728215AbgDHKpt (ORCPT + 99 others); Wed, 8 Apr 2020 06:45:49 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:53128 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbgDHKpt (ORCPT ); Wed, 8 Apr 2020 06:45:49 -0400 Received: by mail-pj1-f68.google.com with SMTP id ng8so1002749pjb.2 for ; Wed, 08 Apr 2020 03:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xn/9gW4cVNsKY+C/0Cg/50ED51EAz2uYRVZSESOP2rA=; b=mEKVhFw9l0TWDeIOwnyKe3Kvx59CkvLwgSp+QZkkoiLICNpi6XxU7BOwEPH8OE3UxO 1BBSZgQQgYo2SBL3StGT6lsjR/O9CXs7OsKe9QyLs4ZJeydb9Jq1Tr2uycE0oOFEIeHb Jnkr82nCM4zyGxCtmZ1wZXclgX0u7dY374gTTCY0aWqRUc3KvPs291msMpHkj2pJ9zu9 kUafp0LIwrO18Bu9gQLROeXRM86jyiDiXbST7mzP3rA15m+3bT87Z5JrIrlGxHaa0hbj eVz0FYmTeUwfB0sJof+ncRtTVe3hO8POISwwB9AvT6mbBtkaBJLLMlS0BZ5Yy2QG6+D2 jEqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xn/9gW4cVNsKY+C/0Cg/50ED51EAz2uYRVZSESOP2rA=; b=fM9XFaNhXuD0UDzRtDhkeOEC2k0MBrElDM2VQxF/MSKy+wTid1+y4JbYuiWPmUTqDr 3hgSVdAd/ELTIkZMBGbrWQoGonb46nWoB5YjR5VpY/lRsOrkEyePO6dsLQnvxCOITS+H EynIDNvAKZUnG3AFxrVhAA8wiwYEDEN5P1exAZ2GaJeFxwFsYqP9/6aZ/jSa9PcgrEUT oh0aCCJfH086sP86ETFQ+ECNcKb12DsL2cYpEfYTFTPVp2R+7Cqlm8kEYVEVXSoNl/YC 6cFPmBSjsv5EcwpTl3m+hYEJD/6G7bEhYj97X2UxdCbvL+UrwC3lcqixqsQ/pIQfYuyn VQ/w== X-Gm-Message-State: AGi0PuY/fEIA14LIKXBupBnMkmQYJG9Ij0QMStT0Sju9RzvBKvQOtj8w N+xJOi7wkbBxfFiYtXqtrzJ5OQeH9CI= X-Received: by 2002:a17:902:be12:: with SMTP id r18mr6836746pls.303.1586342747917; Wed, 08 Apr 2020 03:45:47 -0700 (PDT) Received: from localhost.localdomain (ftp.datadirectnet.jp. [182.171.80.51]) by smtp.gmail.com with ESMTPSA id y17sm16177024pfl.104.2020.04.08.03.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Apr 2020 03:45:47 -0700 (PDT) From: Wang Shilong To: linux-ext4@vger.kernel.org Cc: lixi@ddn.com, adilger@dilger.ca, sihara@ddn.com, Wang Shilong Subject: [RFC PATCH 07/46] e2fsck: add assert when copying context Date: Wed, 8 Apr 2020 19:44:35 +0900 Message-Id: <1586342714-12536-8-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1586342714-12536-1-git-send-email-wangshilong1991@gmail.com> References: <1586342714-12536-1-git-send-email-wangshilong1991@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Li Xi Adding the assert would simplify the copying of context. Signed-off-by: Li Xi Signed-off-by: Wang Shilong --- e2fsck/pass1.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 599c69aa..2fafeb38 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -46,6 +46,7 @@ #ifdef HAVE_ERRNO_H #include #endif +#include #include "e2fsck.h" #include @@ -2157,6 +2158,18 @@ static errcode_t e2fsck_pass1_thread_prepare(e2fsck_t global_ctx, e2fsck_t *thre ext2_filsys thread_fs; ext2_filsys global_fs = global_ctx->fs; + assert(global_ctx->inode_used_map == NULL); + assert(global_ctx->inode_dir_map == NULL); + assert(global_ctx->inode_bb_map == NULL); + assert(global_ctx->inode_imagic_map == NULL); + assert(global_ctx->inode_reg_map == NULL); + assert(global_ctx->inodes_to_rebuild == NULL); + + assert(global_ctx->block_found_map == NULL); + assert(global_ctx->block_dup_map == NULL); + assert(global_ctx->block_ea_map == NULL); + assert(global_ctx->block_metadata_map == NULL); + retval = ext2fs_get_mem(sizeof(struct e2fsck_struct), &thread_context); if (retval) { com_err(global_ctx->program_name, retval, "while allocating memory"); -- 2.25.2