Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1587484
| From | Yunlong Song <yunlong.song@huawei.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro |
| Date | 2017-02-24 11:00 +0100 |
| Message-ID | <tekPo-6Kt-23@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
No need to check the "if" condition each time, just change it to macro codes.
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
---
fs/f2fs/node.h | 20 ++++++++++----------
fs/f2fs/segment.c | 5 +++--
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 3fc9c4b..3e5a58b 100644
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -303,11 +303,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
__u64 cp_ver = le64_to_cpu(ckpt->checkpoint_ver);
- if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
- __u64 crc = le32_to_cpu(*((__le32 *)
- ((unsigned char *)ckpt + crc_offset)));
- cp_ver |= (crc << 32);
- }
+#ifdef CP_CRC_RECOVERY_FLAG
+ __u64 crc = le32_to_cpu(*((__le32 *)
+ ((unsigned char *)ckpt + crc_offset)));
+ cp_ver |= (crc << 32);
+#endif
rn->footer.cp_ver = cpu_to_le64(cp_ver);
rn->footer.next_blkaddr = cpu_to_le32(blkaddr);
}
@@ -318,11 +318,11 @@ static inline bool is_recoverable_dnode(struct page *page)
size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
__u64 cp_ver = cur_cp_version(ckpt);
- if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
- __u64 crc = le32_to_cpu(*((__le32 *)
- ((unsigned char *)ckpt + crc_offset)));
- cp_ver |= (crc << 32);
- }
+#ifdef CP_CRC_RECOVERY_FLAG
+ __u64 crc = le32_to_cpu(*((__le32 *)
+ ((unsigned char *)ckpt + crc_offset)));
+ cp_ver |= (crc << 32);
+#endif
return cp_ver == cpver_of_node(page);
}
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9eb6d89..6c2e1ee 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1573,9 +1573,10 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi,
{
if (force)
new_curseg(sbi, type, true);
- else if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) &&
- type == CURSEG_WARM_NODE)
+#ifndef CP_CRC_RECOVERY_FLAG
+ else if (type == CURSEG_WARM_NODE)
new_curseg(sbi, type, false);
+#endif
else if (need_SSR(sbi) && get_ssr_segment(sbi, type))
change_curseg(sbi, type, true);
else
--
1.8.5.2
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Yunlong Song <yunlong.song@huawei.com> - 2017-02-24 11:00 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Chao Yu <yuchao0@huawei.com> - 2017-02-24 11:40 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Yunlong Song <yunlong.song@huawei.com> - 2017-02-24 12:20 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Chao Yu <yuchao0@huawei.com> - 2017-02-24 12:40 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Yunlong Song <yunlong.song@huawei.com> - 2017-02-24 13:00 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Jaegeuk Kim <jaegeuk@kernel.org> - 2017-02-24 19:20 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Chao Yu <yuchao0@huawei.com> - 2017-02-25 02:00 +0100
Re: [PATCH] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Yunlong Song <yunlong.song@huawei.com> - 2017-02-25 09:20 +0100
[PATCH v2] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Yunlong Song <yunlong.song@huawei.com> - 2017-02-25 09:00 +0100
Re: [PATCH v2] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Jaegeuk Kim <jaegeuk@kernel.org> - 2017-02-25 19:50 +0100
csiph-web