From patchwork Mon Mar 13 13:20:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 68842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1191197wrd; Mon, 13 Mar 2023 06:38:56 -0700 (PDT) X-Google-Smtp-Source: AK7set+XLLHKMEkSRtZaEeRlRRmXQJOaTVZ5sHRoADF1tezkOaEXAJiJw63bbVN7hWrIiCEPvFbr X-Received: by 2002:a17:902:e886:b0:199:4a00:9788 with SMTP id w6-20020a170902e88600b001994a009788mr43719212plg.19.1678714736408; Mon, 13 Mar 2023 06:38:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678714736; cv=none; d=google.com; s=arc-20160816; b=d5/6R/veRgwCDqDHtKo0Qkxcq54kQucVPQQa5tHYqBVXW++h8CbVd5oGCieuMRuH5C WvAW5InwA7drNuGUT0l1AEqjRTXaHGsd3Rt0GrRD9WSQluh0XvmnjJvVT36bASmyHx8m ReevWxOzUATKZEgpqg0+/g/jsl/+NaGAK+4Ik/I2AVyCdsM+tbSnmbuLyvWXiiAiAN2g jffSqIqniRFmWA75naYFp/6KIe0Y9cYPx1iDaoStH99RQyQTHGZhXqPPbr2kdAKUPSwC 8uZW8xQY8fWdbK/Q3jvVj+05yOcb8hGbPMU5AcSZPGLdJbo4w5bbHGhbR9A4Y49CQO2z Ce6Q== 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=XvJRtSQxJ7IdEcIipCoywRuhSisNrVsCbAVR5Hiy8KY=; b=Do6G8TbZbMoLr6CjNa+AJH0N9E6ZaFRe1pKSKIsyFit1a6CnZx6AQu9utoFaU3VzNM GHP6FXk44HGc3UcH5jiwru3FkwK/+dRQ7eSmAvkm3egiS3HLixIzVYye3DFnuXgzX4xx wrqFKmQC6N+O/h3WbqqPunCU5zIdsfLTCse94lOyTVuBVI+ohY0+irZwi25PaNPKFIDJ U0ZYwP1Jy6wGFYLABHu/k7bFZ4O3KhuqR7OwDS4Wh8IPHO+gKCupzmnw6G4ILBmX/6HM ikhxHoibP/vShcbgovjUn/TWagWXYubOyIFOrF1No97tStA9jJeu/3YV0gTMcU3iMTEb NdRw== 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 v6-20020a1709029a0600b0019ccdd9d745si6569690plp.17.2023.03.13.06.38.41; Mon, 13 Mar 2023 06:38:56 -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 S230443AbjCMNVd (ORCPT + 99 others); Mon, 13 Mar 2023 09:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbjCMNVQ (ORCPT ); Mon, 13 Mar 2023 09:21:16 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87093305F0; Mon, 13 Mar 2023 06:21:15 -0700 (PDT) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PZy305DJDzKmR5; Mon, 13 Mar 2023 21:21:00 +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; Mon, 13 Mar 2023 21:21:12 +0800 From: Zhihao Cheng To: , , , CC: , , , Subject: [PATCH v2 5/5] jbd2: remove j_format_version Date: Mon, 13 Mar 2023 21:20:21 +0800 Message-ID: <20230313132021.672134-6-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230313132021.672134-1-chengzhihao1@huawei.com> References: <20230313132021.672134-1-chengzhihao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1760259983275054440?= X-GMAIL-MSGID: =?utf-8?q?1760259983275054440?= From: Zhang Yi journal->j_format_version is no longer used, remove it. Signed-off-by: Zhang Yi Signed-off-by: Zhihao Cheng --- 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 f99c46d880b2..c19cdd402a5f 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2003,15 +2003,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 7095c0f17ad0..b7c79f68f7ca 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. */