From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968499AbdDSRjL (ORCPT ); Wed, 19 Apr 2017 13:39:11 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:57476 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966190AbdDSRjJ (ORCPT ); Wed, 19 Apr 2017 13:39:09 -0400 From: Arnd Bergmann To: Jaegeuk Kim , Chao Yu Cc: Arnd Bergmann , DongOh Shin , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] f2fs: improve definition of statistic macros Date: Wed, 19 Apr 2017 19:38:33 +0200 Message-Id: <20170419173841.3885833-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:EKuMO6nRjTNG7jPFocKOPRbBe/5bal+NvAdhS2tQlFJwHjaQ0Zr a/Uwpd0FMAS9a7yVXjl30SOT6nsW8rBOC27Va7bJ6wKTC2l5UzoeQHkjLlUoJA1Ypzb5bEM aUB6c7xTiMPxpkXUYOrASN0dgvmn9sDc6s7GXjyHdYRe/PS/YI3dc5sBgEK5R9hZDV3jbNo 3CyhYrtZ7RXKxu6rI1+rQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:AOVFWhB0a/o=:v3BTw4U6uHI8fT34uLNpD6 0UYxUGBeUaOGov+E9WfNzvFv/e6QzG9Dm/WDy+NbGm4DqYLpgaIUaPRIE2m4e0g6sGxVnZxLw 3AIefJHl8NEJjYeL4WgL1YVp1QqE79oCtg5W4VhY7E1/C2OiTYM+cz3RnEjE1nMq3ESssdD3P GhiYJmMaJVDXH/5D4AZmu+bAWpNOCJdIXp6Gx8gAvGynmNPIfgNFBfTuefU8m7mV1laXuYrke 7J5zdcG0eHkHaYOD+UvvvJcneRANnGKl7p2+MV68kHsaPWln+/7hRnK/qu29T7C1RVxbdMpCY QYhQPcZa3FxVU96Yz4WxHzGFi2UGd6TDeqh6ywyzwCyzsyJBc6EDvJBA0WS4cQQgg2mC0h2qF q+rrMxhihmAtmmHuKem0J9badFvShkIspyVV4n4ymqtbDagPFef5PZalCCyMEgyFo1MeboYjL LTRMwa267TBSJ5WvH6Q7QOWbVtElszLCALNSBwLHUiQ4ePEAsxmK4d8jXEQq/yNwsNBmAMlJe wVZj7DxpdlbBPYKbhG8SyRRU4OLyV07lnkQb9w4nXNGIdtWoC4qAEXX/a50HfDztnpKINmGeT /LbRZ/vU0VGkuI+csINtjO8ykoKZoSOlWpfZYIJXMJPCxBOiUQJlZ/A4utOsc4UI9lnO7731a XyzLJUv+HsMMCvb9Hww7RsRAayyLRQiXaFrhxVPxyKn+TO51OFjNeK2PDnGeBbuyqDwM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With a recent addition of f2fs_lookup_extent_tree(), we get a warning about the use of empty macros: fs/f2fs/extent_cache.c: In function 'f2fs_lookup_extent_tree': fs/f2fs/extent_cache.c:358:32: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] stat_inc_rbtree_node_hit(sbi); A good way to avoid the warning and make the code more robust is to define all no-op macros as 'do { } while (0)'. Fixes: 54c2258cd63a ("f2fs: extract rb-tree operation infrastructure") Signed-off-by: Arnd Bergmann --- fs/f2fs/f2fs.h | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 18bb86ac0f33..cdd33af74e01 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2464,35 +2464,35 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi); int __init f2fs_create_root_stats(void); void f2fs_destroy_root_stats(void); #else -#define stat_inc_cp_count(si) -#define stat_inc_bg_cp_count(si) -#define stat_inc_call_count(si) -#define stat_inc_bggc_count(si) -#define stat_inc_dirty_inode(sbi, type) -#define stat_dec_dirty_inode(sbi, type) -#define stat_inc_total_hit(sb) -#define stat_inc_rbtree_node_hit(sb) -#define stat_inc_largest_node_hit(sbi) -#define stat_inc_cached_node_hit(sbi) -#define stat_inc_inline_xattr(inode) -#define stat_dec_inline_xattr(inode) -#define stat_inc_inline_inode(inode) -#define stat_dec_inline_inode(inode) -#define stat_inc_inline_dir(inode) -#define stat_dec_inline_dir(inode) -#define stat_inc_atomic_write(inode) -#define stat_dec_atomic_write(inode) -#define stat_update_max_atomic_write(inode) -#define stat_inc_volatile_write(inode) -#define stat_dec_volatile_write(inode) -#define stat_update_max_volatile_write(inode) -#define stat_inc_seg_type(sbi, curseg) -#define stat_inc_block_count(sbi, curseg) -#define stat_inc_inplace_blocks(sbi) -#define stat_inc_seg_count(sbi, type, gc_type) -#define stat_inc_tot_blk_count(si, blks) -#define stat_inc_data_blk_count(sbi, blks, gc_type) -#define stat_inc_node_blk_count(sbi, blks, gc_type) +#define stat_inc_cp_count(si) do { } while (0) +#define stat_inc_bg_cp_count(si) do { } while (0) +#define stat_inc_call_count(si) do { } while (0) +#define stat_inc_bggc_count(si) do { } while (0) +#define stat_inc_dirty_inode(sbi, type) do { } while (0) +#define stat_dec_dirty_inode(sbi, type) do { } while (0) +#define stat_inc_total_hit(sb) do { } while (0) +#define stat_inc_rbtree_node_hit(sb) do { } while (0) +#define stat_inc_largest_node_hit(sbi) do { } while (0) +#define stat_inc_cached_node_hit(sbi) do { } while (0) +#define stat_inc_inline_xattr(inode) do { } while (0) +#define stat_dec_inline_xattr(inode) do { } while (0) +#define stat_inc_inline_inode(inode) do { } while (0) +#define stat_dec_inline_inode(inode) do { } while (0) +#define stat_inc_inline_dir(inode) do { } while (0) +#define stat_dec_inline_dir(inode) do { } while (0) +#define stat_inc_atomic_write(inode) do { } while (0) +#define stat_dec_atomic_write(inode) do { } while (0) +#define stat_update_max_atomic_write(inode) do { } while (0) +#define stat_inc_volatile_write(inode) do { } while (0) +#define stat_dec_volatile_write(inode) do { } while (0) +#define stat_update_max_volatile_write(inode) do { } while (0) +#define stat_inc_seg_type(sbi, curseg) do { } while (0) +#define stat_inc_block_count(sbi, curseg) do { } while (0) +#define stat_inc_inplace_blocks(sbi) do { } while (0) +#define stat_inc_seg_count(sbi, type, gc_type) do { } while (0) +#define stat_inc_tot_blk_count(si, blks) do { } while (0) +#define stat_inc_data_blk_count(sbi, blks, gc_type) do { } while (0) +#define stat_inc_node_blk_count(sbi, blks, gc_type) do { } while (0) static inline int f2fs_build_stats(struct f2fs_sb_info *sbi) { return 0; } static inline void f2fs_destroy_stats(struct f2fs_sb_info *sbi) { } -- 2.9.0