From patchwork Mon Mar 13 13:20:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 68845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1192222wrd; Mon, 13 Mar 2023 06:41:01 -0700 (PDT) X-Google-Smtp-Source: AK7set/pf+xgjbWjGTJw8SCVpOQrt4neAgCTK6GkX0xQVz2vDOSJbtzvdpl/mgAub4mZBBXS/fqw X-Received: by 2002:a62:8402:0:b0:623:1396:4611 with SMTP id k2-20020a628402000000b0062313964611mr6436617pfd.9.1678714861228; Mon, 13 Mar 2023 06:41:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678714861; cv=none; d=google.com; s=arc-20160816; b=IzVSEXQmNMKIOTF5bnWMl7u/hl9wErkpVEKhx4tzLT3oNZOackL3MLVvhBlnHW6QuR lEhsv3EkB1U/k/pRwalTKI0jebwqViL8KEPp3jjvxmEI1J2orZgsFPw0olh8GfF5u9MV twQCefnGNSHLcrYP2kYevwYxQ2tShDbyVQr/GPc4xN9ymDdme3WWetedr/qW/vFxoJ/t Wu5i5E4bAoZxds2BQiePhU8Or/5YgoTrhDc9qs4Y/Ao//et2D+sNWu4lmGW3eXG9DIiG oXGa/RBj4rIxYQLp6AFERV6+Qsl77tyvbkEtiyzOMrI6Cpjnm4niLg1x8OTknUMFAgS/ SRFA== 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=r9vN5KF/ve1+PIvg2+TaGwq3HMbvIOQ1Vf6hYMEzVq0=; b=U0drbts2cXW+gJUQDgL7ORYzm2jTbqrXgYSGMNajMEJN5IE3V50dsWh1789sEts/tS M5Ws9K++7WDlY9ExL3yuVe++0NpsoJIaBg45Xk+D3nKUnjt4RJp/UiIRDgSi+cD55wMz mI87zAJWT2GHnfS9nS0Xs6gzoz2vUwigIUxpDrXdt56jBmfVOwXSP3KUysHDvt5Q0N11 Ws2vPeVDC3faptp7wWN2XSAs7Iv2MqxrZ0Z/qC28YFvC+YSdnbyYJqiLGtqWfDmIprSZ qnGray1ulEdI9tdAGloz+1gbAylt166ejvQ+3XxjqChSxYOr9KDz39y+Sk5CiFi0gfbj y/GQ== 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 z15-20020aa791cf000000b005a9c2c4657fsi6452032pfa.191.2023.03.13.06.40.46; Mon, 13 Mar 2023 06:41:01 -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 S230410AbjCMNVW (ORCPT + 99 others); Mon, 13 Mar 2023 09:21:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229910AbjCMNVP (ORCPT ); Mon, 13 Mar 2023 09:21:15 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3288734008; Mon, 13 Mar 2023 06:21:13 -0700 (PDT) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PZxzr3M6dz17KjY; Mon, 13 Mar 2023 21:18:16 +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:10 +0800 From: Zhihao Cheng To: , , , CC: , , , Subject: [PATCH v2 2/5] jbd2: remove unused feature macros Date: Mon, 13 Mar 2023 21:20:18 +0800 Message-ID: <20230313132021.672134-3-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, RCVD_IN_MSPIKE_H2,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?1760260114501991235?= X-GMAIL-MSGID: =?utf-8?q?1760260114501991235?= 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 --- include/linux/jbd2.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 5962072a4b19..ad7bb6861143 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