From patchwork Fri Mar 10 12:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihao Cheng X-Patchwork-Id: 67388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp860196wrd; Fri, 10 Mar 2023 05:07:31 -0800 (PST) X-Google-Smtp-Source: AK7set86S77l/dpgmW2HATr41YjnpyyeT9gZzuSgN9QvJu4iQkJeQ6JjdzEY2SHNannQ3YD0o4lL X-Received: by 2002:a62:19d6:0:b0:5a8:be36:65a8 with SMTP id 205-20020a6219d6000000b005a8be3665a8mr21916287pfz.27.1678453651422; Fri, 10 Mar 2023 05:07:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678453651; cv=none; d=google.com; s=arc-20160816; b=Jq3OGvuAJNtUgv3gZveO2sIhYS8gFhGvw+JyWfBukAhiIPz4Vn4GR4uTc3CIb+js8P i5Nk0nS4yq6JTLKZ6Bb/X0JwaOX5XIzirRqSRQlK83AFK9jPeD7jJzWxYc9SId9oy6GF OuqNN18vVAw0JwnNayUYKSNYXlXDNWhmSobnIYq7C6kwTOI3EnlS9h52bq2B9IWnfGRI OTIjIJC48vKbPzaGC43YxDDZYhYotEki/Lim00qOmfScYa7AwpDWz4KIQ32zvQV14Ynj u5Qo9+fUCztb+yXFlDFn4ORYQbxFVGwDUuTt6+1k4nPnsORx9AyHVvHt6ddWRFVYpGkB DZqw== 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=CeVbYwBJYHkib7As00B1fyciOtFFgAWRGrhXVNLUzHSFWX7SHBqYAgvYMU3xGp3pTC s9HmpFCEKjaIaOq3QOUYkYdGBi6I+kkIorBfYnFdMkWL3eFPDgtBLm+jnEqC1wCnEb/y A/ysttI6+KqSdyuVfPLy2DQqXytKV+p461B0x1gMi9Pn3zVfLjxasJ74HpW+VGmp7KQm e/rPLBXNwrloacC+FUTVYdfQIM4vIoRgn9l75SBHros9KXmAVdYlcJIjcVVpcpRk21eV JBn+uYkMrd9mJbHiXxsAhW1saW4crJMwUIq3dJ8eKVgjDnurvk5yf+0G/UuBLcBAu0Ie 2Jcw== 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 c28-20020aa7953c000000b00593b134c4easi1831808pfp.187.2023.03.10.05.07.18; Fri, 10 Mar 2023 05:07:31 -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 S230039AbjCJMxJ (ORCPT + 99 others); Fri, 10 Mar 2023 07:53:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbjCJMw5 (ORCPT ); Fri, 10 Mar 2023 07:52:57 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94FFA10DE4B; Fri, 10 Mar 2023 04:52:53 -0800 (PST) Received: from kwepemm600013.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PY5Vc4sCMz16PB8; Fri, 10 Mar 2023 20:50: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; Fri, 10 Mar 2023 20:52:50 +0800 From: Zhihao Cheng To: , , CC: , , , Subject: [PATCH 2/5] jbd2: remove unused feature macros Date: Fri, 10 Mar 2023 20:52:03 +0800 Message-ID: <20230310125206.2867822-3-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, 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?1759986215811118131?= X-GMAIL-MSGID: =?utf-8?q?1759986215811118131?= 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 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