From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com ([45.249.212.188]:3350 "EHLO dggrg02-dlp.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751559AbdBYHtr (ORCPT ); Sat, 25 Feb 2017 02:49:47 -0500 From: Yunlong Song To: , , , , , , CC: , , , Subject: [PATCH v2] f2fs: change the codes of checking CP_CRC_RECOVERY_FLAG to macro Date: Sat, 25 Feb 2017 16:01:18 +0800 Message-ID: <1488009678-17334-1-git-send-email-yunlong.song@huawei.com> In-Reply-To: <1487930771-14491-1-git-send-email-yunlong.song@huawei.com> References: <1487930771-14491-1-git-send-email-yunlong.song@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-fsdevel-owner@vger.kernel.org List-ID: No need to check the "if" condition each time, just change it to macro codes. Signed-off-by: Yunlong Song --- fs/f2fs/node.h | 10 +++++----- fs/f2fs/segment.c | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h index 3fc9c4b..caebb23 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); } 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