From patchwork Fri Mar 10 12:52:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 67389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp861308wrd; Fri, 10 Mar 2023 05:09:24 -0800 (PST) X-Google-Smtp-Source: AK7set8HvulAdJDd9S4o2D/SAX+CozvGKSrSkqaGm78JqiscC0PHP6ZNixt3ICqM7ZUCZ5+JYDK/ X-Received: by 2002:a62:1748:0:b0:5dc:6dec:e9b9 with SMTP id 69-20020a621748000000b005dc6dece9b9mr23746758pfx.21.1678453764359; Fri, 10 Mar 2023 05:09:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678453764; cv=none; d=google.com; s=arc-20160816; b=nxhOufF8JMbKXepz7/RQMWpfAEX78fIoDbabwrquEg5nD8QzfJQXUBgseEKFu4HDbS p1fXspWEmgdf0/D4psxqodW8LYSoIOP8m+dApqF/G8rPYOBSbplW6jWX1TqVcPejBetB Mw5v8n9VFwFTGFG/xFVYcO4hz1NBqksJby8riBPvK9S3yOE0vGCvpMxhePMQpjACeof2 LVnfbMncPmdSmJbnvMHsLRk2Pvqj+t99AoQ3+Jn1cGmhYYT4I5+7iFJVUiEbn1HfTFS0 EqSqRhLXMPwtmfg+7Zbp/zpeoJ/LqzHj9oCgT1139SFgG/uDuxXgufVcpk4LXK5YYDlK 9HWA== 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=iojIUI2RQaUvhhjXlvk4T7aq3HaSV0Telni2/k+Smtw=; b=KQyD/7fFTN46QIDIO3cnT3MjS56+IDm/dEXxumzRHqGITYwnM0z4NVUDVyN7cUe+Cz nTFzFPaH+QI/eT6mlI6eS8kaj0hzLuWiUERfqnNFogVi6imBkV+j7eju93BxcV3D3oM9 UYa8STPskLLUjZ+RS/Te69xEOF18/V8tILBrpOKXvvW7tmRvsbdFu8NWvn2Yye6EOwwV IBBEtjONNNLPEBZ+DUmFI+WRFyJ2mNbcmD5ZecVChLg99y7FMDeZKhTehszdoSGwRB7f njl7ZTm4AsFjM6jQkVYEElAV3oq1X0Jy56CqggEPKVoruqOodK45JoNGrtfuEklHlYRu HyYA== 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 x9-20020a63cc09000000b004fac433dbcdsi1963171pgf.134.2023.03.10.05.08.30; Fri, 10 Mar 2023 05:09:24 -0800 (PST) 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 S230373AbjCJMxU (ORCPT + 99 others); Fri, 10 Mar 2023 07:53:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjCJMxM (ORCPT ); Fri, 10 Mar 2023 07:53:12 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED7B42130; Fri, 10 Mar 2023 04:52:54 -0800 (PST) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PY5Vd5HDhznWZn; Fri, 10 Mar 2023 20:50:01 +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; Fri, 10 Mar 2023 20:52:52 +0800 From: Zhihao Cheng To: , , CC: , , , Subject: [PATCH 5/5] jbd2: remove j_format_version Date: Fri, 10 Mar 2023 20:52:06 +0800 Message-ID: <20230310125206.2867822-6-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230310125206.2867822-1-chengzhihao1@huawei.com> References: <20230310125206.2867822-1-chengzhihao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) 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?1759986334181920065?= X-GMAIL-MSGID: =?utf-8?q?1759986334181920065?= 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 cd94d068b4e6..fbada835b6b7 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1997,15 +1997,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. */