2017-09-10 11:15:47

by Yunlong Song

Subject: [PATCH] f2fs-tools: fix is_set_ckpt_flags for correct bool value

If flag bit to check is in 0xFFFFFF00, then the return value will be false,
this is not correct, so fix it.

Signed-off-by: Yunlong Song <[email protected]>
---
fsck/f2fs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index 871cffc..de03512 100644
--- a/fsck/f2fs.h
+++ b/fsck/f2fs.h
@@ -276,7 +276,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)
static inline bool is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f)
{
unsigned int ckpt_flags = le32_to_cpu(cp->ckpt_flags);
- return ckpt_flags & f;
+ return ckpt_flags & f ? 1 : 0;
}

static inline block_t __start_cp_addr(struct f2fs_sb_info *sbi)
--
1.8.5.2

2017-09-12 01:12:23

by Chao Yu

Subject: Re: [PATCH] f2fs-tools: fix is_set_ckpt_flags for correct bool value

On 2017/9/10 19:15, Yunlong Song wrote:
> If flag bit to check is in 0xFFFFFF00, then the return value will be false,
> this is not correct, so fix it.
>
> Signed-off-by: Yunlong Song <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

> ---
> fsck/f2fs.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fsck/f2fs.h b/fsck/f2fs.h
> index 871cffc..de03512 100644
> --- a/fsck/f2fs.h
> +++ b/fsck/f2fs.h
> @@ -276,7 +276,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)
> static inline bool is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f)
> {
> unsigned int ckpt_flags = le32_to_cpu(cp->ckpt_flags);
> - return ckpt_flags & f;
> + return ckpt_flags & f ? 1 : 0;
> }
>
> static inline block_t __start_cp_addr(struct f2fs_sb_info *sbi)
>