From patchwork Wed Mar 15 01:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 69926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2085358wrd; Tue, 14 Mar 2023 18:49:57 -0700 (PDT) X-Google-Smtp-Source: AK7set9PuHX6E8kHvZ9DQfuGtIvu6cOZMy0+Z/+iqxY72+O7EqLv3V8gxdh31V7D4RUedW5idFBK X-Received: by 2002:aa7:9f96:0:b0:625:5e9e:17d5 with SMTP id z22-20020aa79f96000000b006255e9e17d5mr3349712pfr.9.1678844997174; Tue, 14 Mar 2023 18:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678844997; cv=none; d=google.com; s=arc-20160816; b=EGIMJhKtQw/te4UsTaYJknd0/Ma/O/3cjt6tWAqoyLkMKVA9Yivo5DfmGMh0uPW30g 8SiogWuS/ifawsbvE/WX92poYnGQncpQxhmm9gjOulQWA5OPb3AnJeVUmhcXdZbxf/bo 3o2QwKmJyPKmFkSfm+LZNiXLLKxpH/CW9BkE/2yj+kbCOnN/OZrEB7YPfow04QE4iNS+ G4belV2/6VLwnBY04BiRObQvN80NbMpgT6D8uRI6/wO8shFzxppdmc/xNznLHY4Z9aXP EJn0phLakzyEpL6afUjjGz1NrI2kgK/z5yEb2rNcfor73Ocoh/kd7kk3msf63qthl74S Qh5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Qb6pESAc8W350yQcNMZ4RCy6UvU+MMAe8NR/s/eKCTE=; b=rsxkmsJhe1cTc9llzYnTzE3m5/8fvfxmiSB+QT73v+zg2YUVhaKOBFNA1+pPiVrGkB enwsooTqUNlNaI7GBmeB1t772nRYBuupP7SVBeCMVj7igQlLenQhHDrFtYjOXk9MtWE/ v07ZTNFYcOqt58k3QDZRVL8JDe6M2yYvOfre3w199ZiZIq2hFhOJSVXyyvnm15YEhuSC b9prmlUA+UMCz0/HV4p85EUsxp+dvOx51A5VmrtPAi+XGIoPUtH28OX/qr3jdDkmKqKB 3MEnMGNTk8OaQYYRxlWMNKsKC0wsFAIHpaYpfIkqAfMKz/cF5oQmynVrA1CYRybtRuTo bGqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s12-20020a056a00178c00b006257ed5354bsi2045005pfg.195.2023.03.14.18.49.44; Tue, 14 Mar 2023 18:49:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjCOBdT (ORCPT + 99 others); Tue, 14 Mar 2023 21:33:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbjCOBdD (ORCPT ); Tue, 14 Mar 2023 21:33:03 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7805C32513; Tue, 14 Mar 2023 18:32:34 -0700 (PDT) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pbt8y1ks7znX4T; Wed, 15 Mar 2023 09:29:22 +0800 (CST) Received: from huawei.com (10.175.127.227) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 15 Mar 2023 09:32:19 +0800 From: Zhihao Cheng To: , , , CC: , , , Subject: [PATCH v3 6/6] jbd2: remove j_format_version Date: Wed, 15 Mar 2023 09:31:28 +0800 Message-ID: <20230315013128.3911115-7-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230315013128.3911115-1-chengzhihao1@huawei.com> References: <20230315013128.3911115-1-chengzhihao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760396571913175003?= X-GMAIL-MSGID: =?utf-8?q?1760396571913175003?= From: Zhang Yi journal->j_format_version is no longer used, remove it. Signed-off-by: Zhang Yi Signed-off-by: Zhihao Cheng Reviewed-by: Jan Kara --- fs/jbd2/journal.c | 9 --------- include/linux/jbd2.h | 5 ----- 2 files changed, 14 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index ee678f9e40c4..837a9a85e585 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2006,15 +2006,6 @@ static int load_superblock(journal_t *journal) sb = journal->j_superblock; - switch (be32_to_cpu(sb->s_header.h_blocktype)) { - case JBD2_SUPERBLOCK_V1: - journal->j_format_version = 1; - break; - case JBD2_SUPERBLOCK_V2: - journal->j_format_version = 2; - break; - } - journal->j_tail_sequence = be32_to_cpu(sb->s_sequence); journal->j_tail = be32_to_cpu(sb->s_start); journal->j_first = be32_to_cpu(sb->s_first); diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 1ffcea5c024e..6990fc891612 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -792,11 +792,6 @@ struct journal_s */ journal_superblock_t *j_superblock; - /** - * @j_format_version: Version of the superblock format. - */ - int j_format_version; - /** * @j_state_lock: Protect the various scalars in the journal. */