lkml.org 
[lkml]   [2020]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 18/21] ext2: fix empty body warnings when -Wextra is used
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit 44a52022e7f15cbaab957df1c14f7a4f527ef7cf ]

    When EXT2_ATTR_DEBUG is not defined, modify the 2 debug macros
    to use the no_printk() macro instead of <nothing>.
    This fixes gcc warnings when -Wextra is used:

    ../fs/ext2/xattr.c:252:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
    ../fs/ext2/xattr.c:258:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
    ../fs/ext2/xattr.c:330:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
    ../fs/ext2/xattr.c:872:45: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]

    I have verified that the only object code change (with gcc 7.5.0) is
    the reversal of some instructions from 'cmp a,b' to 'cmp b,a'.

    Link: https://lore.kernel.org/r/e18a7395-61fb-2093-18e8-ed4f8cf56248@infradead.org
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: Jan Kara <jack@suse.com>
    Cc: linux-ext4@vger.kernel.org
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/ext2/xattr.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
    index babef30d440b1..a54037df2c8a8 100644
    --- a/fs/ext2/xattr.c
    +++ b/fs/ext2/xattr.c
    @@ -55,6 +55,7 @@

    #include <linux/buffer_head.h>
    #include <linux/init.h>
    +#include <linux/printk.h>
    #include <linux/slab.h>
    #include <linux/mbcache.h>
    #include <linux/quotaops.h>
    @@ -83,8 +84,8 @@
    printk("\n"); \
    } while (0)
    #else
    -# define ea_idebug(f...)
    -# define ea_bdebug(f...)
    +# define ea_idebug(inode, f...) no_printk(f)
    +# define ea_bdebug(bh, f...) no_printk(f)
    #endif

    static int ext2_xattr_set2(struct inode *, struct buffer_head *,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-15 14:04    [W:3.732 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site