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 <[email protected]> --- 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
