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;
From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH] f2fs: remove F2FS_SET_FEATURE() and F2FS_CLEAR_FEATURE() macro
Date:   Thu, 24 Nov 2022 11:37:08 +0800
Message-Id: <20221124033708.10580-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?A5/rFk2L0Zo+H+h67pATrsgbWKs+iXQORCHL2iyMY1f2Q+ZpVToNWL99Dbvr?=
 =?us-ascii?Q?9EjjkW+QtHrTDKz0NeyXAh4RPjY/oihRrotbRIu9VnYuHxMaBhwyUvLKE5g+?=
 =?us-ascii?Q?T1ENyZ9clCKbjMf3S5AfP3gmbwicouXgAiHo35A5RXDhjxRaSFV47WrIFc4T?=
 =?us-ascii?Q?5Rbz12iKbLDrxnbfBXaVerKffgw3H6aHNo/qKuDGb9RXxhrImA/TBwpxdpum?=
 =?us-ascii?Q?vXtvFFhMTdp/yP4tdKlWsBnt8URv6RwAhtAgj+bfqWwmy4ZEOrZUqk60rRc9?=
 =?us-ascii?Q?nQqyE5mFdCWuPm309n4leUwX1wbX7AGPBlbg5wLtuAzi/NhMKhBlCTtlaLqO?=
 =?us-ascii?Q?+ais+hDHAm01h1b5bGMoGo1A+qnwGuk3I31d3fuU14FG2exHIlbKZjOxDhUB?=
 =?us-ascii?Q?f2hNcZNbmKbaVNfrY7e56+Xl54UKTwPqtScL2//mnwBKbQmCr22wWEsaQi0G?=
 =?us-ascii?Q?4s0UaAA8CFbVck/wWNiRJX2lweMFRJbcf0UI4mXuxtPURB86Dj3wGP3aH10J?=
 =?us-ascii?Q?Qy4SS7OHD1ljTa7iki04x6S4NuwHWWJS1LIJt/XAPVOxm+2J+V8xEr8OyQHp?=
 =?us-ascii?Q?RdWub3RPf/yaGDtXsoDOVwjYSBJrkta/P5V9KiPgykSCyd6B5Ktvo38bqPmT?=
 =?us-ascii?Q?wadQcyBKlAi6A7pkzADu0sGBSg/taZWa2Y8dVpe0tZnUhJXMLw3hzwyEGprA?=
 =?us-ascii?Q?AqQrhDmi1ocrKNuxg60hM468fwW1qW/y4XOeIUVwqfIdgi5rFI+CPm+RkDEu?=
 =?us-ascii?Q?ADocLETukFemMTEk5Eyl9Ds81cAjyEBR85l3muCfJ+due6uAmBwDT7HxOvT2?=
 =?us-ascii?Q?hLYEIiSNdq8f2SlU+f5XpTsLaZ1VCuWby263a4kcXTt3vJlRFDLYYVcTudYF?=
 =?us-ascii?Q?cpu0RgXFsk2Pa/HL5aLZaMBRJcFjoxEjAAQK6bMJ8uDEom3ecmZrLqJPqmhn?=
 =?us-ascii?Q?hczZ0pfsUkDBS7B7XC5b5xtBcOE//bd/yiWjc3ftwDKnga8dl3t5kHvFmqhk?=
 =?us-ascii?Q?QzUTrQQUSb1giV3M6t1hA4HN07Dc62IaOVSUjcxDG1HJgT5nnewmDxhvHfUb?=
 =?us-ascii?Q?C3JWGu7U0SqEQ5qY3nPmgaOZmD+pKKCWy2ygdtpweGJzfO1vHCGpQlSTI/7h?=
 =?us-ascii?Q?LeRIfeF+Sl1JPOlNBQCSE1MC8CLexhXTcRnDHEQi2u72R6GskYa5jU990n2h?=
 =?us-ascii?Q?eit4Ry7TINg2rCmJbQaf6SwHJbvQNPfdQxK4+4m5GQbqhNz3uX1LZvGTbG9b?=
 =?us-ascii?Q?bVofuF2tdJeq9lSDLjv/Orq/2x9Gja4phNBOIVxv9bLUz5NKRFvZLEPW5wyQ?=
 =?us-ascii?Q?UPicYiKKaoSygskgtV1UhYQ4pHpkLXCNeSnqBED4D2V3BKWmJXjNwR3VwlPE?=
 =?us-ascii?Q?S0XwGbpMTu39Wv52WpD9YQVWcsVJc52hWdpWGjc+w4RRLYgcitKT388Q2j9s?=
 =?us-ascii?Q?2cdv49nRqgEQnXTf2aeCKeGeo0kRO8ijtG+dBUpZQrwSmMVwZOFRwL0TnDRE?=
 =?us-ascii?Q?Vld5KgrVNEsDtufbYvobRVkxT/qBvh+cR1eZMofPDK5Fi/K8qYyeVKtYihIK?=
 =?us-ascii?Q?DNU0rzE3Rrh4RdMwPF/4iC17YoKpA+QeKAnymOt8?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7964d4b7-307f-4f5c-fa69-08dacdcd2f8a
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 03:37:17.8316
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NYEHZlJXwRw5LkB8LFi4i2I6E5Lh/A3jYZdA3VTG1qmOPuwoQvAf4dzYmJc65r8xkPVzAwfkI6/ujEpBcZbxiA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4514
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

F2FS_SET_FEATURE() and F2FS_CLEAR_FEATURE() have never
been used since they were introduced by this commit
76f105a2dbcd("f2fs: add feature facility in superblock").

So let's remove them. BTW, convert f2fs_sb_has_##name to return bool.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/f2fs.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f0833638f59e..0640c703cd5d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -203,10 +203,6 @@ struct f2fs_mount_info {
 #define __F2FS_HAS_FEATURE(raw_super, mask)				\
 	((raw_super->feature & cpu_to_le32(mask)) != 0)
 #define F2FS_HAS_FEATURE(sbi, mask)	__F2FS_HAS_FEATURE(sbi->raw_super, mask)
-#define F2FS_SET_FEATURE(sbi, mask)					\
-	(sbi->raw_super->feature |= cpu_to_le32(mask))
-#define F2FS_CLEAR_FEATURE(sbi, mask)					\
-	(sbi->raw_super->feature &= ~cpu_to_le32(mask))
 
 /*
  * Default values for user and/or group using reserved blocks
@@ -4384,7 +4380,7 @@ static inline bool f2fs_disable_compressed_file(struct inode *inode)
 }
 
 #define F2FS_FEATURE_FUNCS(name, flagname) \
-static inline int f2fs_sb_has_##name(struct f2fs_sb_info *sbi) \
+static inline bool f2fs_sb_has_##name(struct f2fs_sb_info *sbi) \
 { \
 	return F2FS_HAS_FEATURE(sbi, F2FS_FEATURE_##flagname); \
 }
-- 
2.25.1