From patchwork Wed Mar 15 01:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 69922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2084070wrd; Tue, 14 Mar 2023 18:46:11 -0700 (PDT) X-Google-Smtp-Source: AK7set8S1DxFqX2PImvXVDjsXvnfP2lAjocnwB2HKz8cLlTi0B1JCLauwk+VXQ/O6Gm2+bJfjSn+ X-Received: by 2002:a17:902:f1d4:b0:19a:bbd0:c5ca with SMTP id e20-20020a170902f1d400b0019abbd0c5camr845362plc.48.1678844771320; Tue, 14 Mar 2023 18:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678844771; cv=none; d=google.com; s=arc-20160816; b=Q0grlHxAxGNeHD6n6QjyPiOdhxu14IOAwD6i0rN5wmCvGiRgBO/0Gty+H+WbpafR/T jXnN5pD/yPdlgj9dn9gW1BtKSVrS+F/NMJpyB2P4g1JOrnWaewtdNLld7FjxXcKM61bM RkFB7sx49uBvnmnwkJKCzNQAjfoBLo9kvqwEjZO8GWqL9hqZBps6XsugF+U31CVuInJq QD6IFAYSkPQLiZqKOYCp4FoQpgBjen+5YzLNauiB96nrSs9WL5QucCckN8T/HM23HK71 C95tRZ2WdmmXsmUI2qTgaDpTpe+fD2QtJ3eoi7bTY1Xt5MdhLCI7Go5rIWKraTs5tORF il6A== 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=91tmhh+RHm+CKNx7w9s22+1tlj1VzWDYjEbLoB9fBlA=; b=i1L2OcsUkEu4q3/zc3bsu9ENmwEi8V/vh1Xr5FQdTsESBGOdubXIPPN7zZpmKKDm5B L3AitVTprWXgJOBXlmjmgm0klzOl819izc6OUxH3jLNLmYGW0vw+38wP0MVL2cnMJP39 M9mK9dcDUcBrrPcaY6rNwd6yv4NeeKrNE2eIJUWRf2/X+On3UoLanwPUPOLBWORxHyeY aeot6QCfO7J4utDqeHFgBbqNPhMWb9aRiGn6nuNAwP8yazYhv1kl8/9qb0ZLiX5gPw3P dmWEjp4YssrOepdHWTsfEy+Lbn8tMaSQ/efLCdk8iPZe1MghUYACY1DhcHHh/LQf+B6t hVxQ== 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 q14-20020a170902dace00b00194a5108613si4144627plx.177.2023.03.14.18.45.55; Tue, 14 Mar 2023 18:46:11 -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 S230293AbjCOBdH (ORCPT + 99 others); Tue, 14 Mar 2023 21:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjCOBcv (ORCPT ); Tue, 14 Mar 2023 21:32:51 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA8BB1F920; Tue, 14 Mar 2023 18:32:19 -0700 (PDT) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pbt9p5srhzHwwT; Wed, 15 Mar 2023 09:30:06 +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:17 +0800 From: Zhihao Cheng To: , , , CC: , , , Subject: [PATCH v3 3/6] jbd2: remove unused feature macros Date: Wed, 15 Mar 2023 09:31:25 +0800 Message-ID: <20230315013128.3911115-4-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?1760396334886069968?= X-GMAIL-MSGID: =?utf-8?q?1760396334886069968?= From: Zhang Yi JBD2_HAS_[IN|RO_]COMPAT_FEATURE macros are no longer used, just remove them. Signed-off-by: Zhang Yi Signed-off-by: Zhihao Cheng Reviewed-by: Jan Kara --- include/linux/jbd2.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index f619bae1dcc5..a91cf9c7a94b 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -274,17 +274,6 @@ typedef struct journal_superblock_s /* 0x0400 */ } journal_superblock_t; -/* Use the jbd2_{has,set,clear}_feature_* helpers; these will be removed */ -#define JBD2_HAS_COMPAT_FEATURE(j,mask) \ - ((j)->j_format_version >= 2 && \ - ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask)))) -#define JBD2_HAS_RO_COMPAT_FEATURE(j,mask) \ - ((j)->j_format_version >= 2 && \ - ((j)->j_superblock->s_feature_ro_compat & cpu_to_be32((mask)))) -#define JBD2_HAS_INCOMPAT_FEATURE(j,mask) \ - ((j)->j_format_version >= 2 && \ - ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask)))) - #define JBD2_FEATURE_COMPAT_CHECKSUM 0x00000001 #define JBD2_FEATURE_INCOMPAT_REVOKE 0x00000001