[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <tencent_9E5D8E4520DCDEE3CBAE5BE70D79F95FFD08@qq.com>
Date: Thu, 18 Dec 2025 10:57:53 +0800
From: Yuwen Chen <ywen.chen@...mail.com>
To: xiang@...nel.org
Cc: chao@...nel.org,
huyue2@...lpad.com,
jefflexu@...ux.alibaba.com,
linux-erofs@...ts.ozlabs.org,
linux-kernel@...r.kernel.org,
Yuwen Chen <ywen.chen@...mail.com>
Subject: [PATCH v2] erofs: simplify the code using for_each_set_bit
When mounting the EROFS file system, it is necessary to check the
available compression algorithms. At this time, the for_each_set_bit
function can be used to simplify the code logic.
Signed-off-by: Yuwen Chen <ywen.chen@...mail.com>
---
v1 -> v2:
- revert the modifications to the fs/erofs/internal.h
fs/erofs/decompressor.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c
index 2ec9b2bb628d6..be1e19b620523 100644
--- a/fs/erofs/decompressor.c
+++ b/fs/erofs/decompressor.c
@@ -405,7 +405,7 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
{
struct erofs_sb_info *sbi = EROFS_SB(sb);
struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
- unsigned int algs, alg;
+ unsigned long algs, alg;
erofs_off_t offset;
int size, ret = 0;
@@ -423,13 +423,10 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
erofs_init_metabuf(&buf, sb);
offset = EROFS_SUPER_OFFSET + sbi->sb_size;
- alg = 0;
- for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {
+ algs = sbi->available_compr_algs;
+ for_each_set_bit(alg, &algs, Z_EROFS_COMPRESSION_MAX) {
void *data;
- if (!(algs & 1))
- continue;
-
data = erofs_read_metadata(sb, &buf, &offset, &size);
if (IS_ERR(data)) {
ret = PTR_ERR(data);
@@ -438,7 +435,7 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
if (alg >= ARRAY_SIZE(erofs_decompressors) ||
!erofs_decompressors[alg].config) {
- erofs_err(sb, "algorithm %d isn't enabled on this kernel",
+ erofs_err(sb, "algorithm %ld isn't enabled on this kernel",
alg);
ret = -EOPNOTSUPP;
} else {
--
2.34.1
Powered by blists - more mailing lists