diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2022-04-21 15:18:14 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-04-22 11:43:13 -0700 |
| commit | 006bb1305a865e69f6b11f11c5dd017387a6e324 (patch) | |
| tree | b65c2d59e0b6e58ca918374b09efe39c2a9e5182 | |
| parent | cb4c5d616ccfac739cf8cef6469da631844aeb1f (diff) | |
| download | f2fs-tools-006bb1305a865e69f6b11f11c5dd017387a6e324.tar.gz | |
Change one array member into a flexible array member
Prepare for verifying structure sizes with static_assert().
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/f2fs.h | 4 | ||||
| -rw-r--r-- | include/f2fs_fs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fsck/f2fs.h b/fsck/f2fs.h index 7fb328f..eacfd42 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -381,7 +381,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) CP_MIN_CHKSUM_OFFSET) chksum_size = sizeof(__le32); - return &ckpt->sit_nat_version_bitmap + offset + chksum_size; + return &ckpt->sit_nat_version_bitmap[offset + chksum_size]; } if (le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload) > 0) { @@ -392,7 +392,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) } else { offset = (flag == NAT_BITMAP) ? le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + return &ckpt->sit_nat_version_bitmap[offset]; } } diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 5b81b72..9733020 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -833,7 +833,7 @@ struct f2fs_checkpoint { unsigned char alloc_type[MAX_ACTIVE_LOGS]; /* SIT and NAT version bitmap */ - unsigned char sit_nat_version_bitmap[1]; + unsigned char sit_nat_version_bitmap[]; } __attribute__((packed)); #define CP_BITMAP_OFFSET \ |