From: Zheng Liu Date: Mon, 26 May 2014 06:55:08 +0000 (+0800) Subject: debugfs: fix two warning messages when compiling with LLVM X-Git-Tag: v1.43-WIP-2015-05-18~283 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ab74c0907150029716ef0a36b2f472c1de833030;p=tools%2Fe2fsprogs.git debugfs: fix two warning messages when compiling with LLVM This commit fixes two warning messages when compiling with LLVM. Reported-by: Andreas Dilger Signed-off-by: Zheng Liu Signed-off-by: Theodore Ts'o Reviewed-by: Lukas Czerner --- diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c index 5276014..a7c30b3 100644 --- a/debugfs/lsdel.c +++ b/debugfs/lsdel.c @@ -152,7 +152,7 @@ void do_lsdel(int argc, char **argv) goto next; } } - if (lsd.free_blocks && !lsd.bad_blocks || + if ((lsd.free_blocks && !lsd.bad_blocks) || inode.i_flags & EXT4_INLINE_DATA_FL) { if (num_delarray >= max_delarray) { max_delarray += 50; diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c index 120afe8..19248a0 100644 --- a/lib/ext2fs/inline_data.c +++ b/lib/ext2fs/inline_data.c @@ -281,10 +281,9 @@ static errcode_t ext2fs_inline_data_convert_dir(ext2_filsys fs, ext2_ino_t ino, struct ext2_dir_entry *dir, *dir2; struct ext2_dir_entry_tail *t; errcode_t retval; - unsigned int offset; + unsigned int offset, rec_len; int csum_size = 0; int filetype = 0; - unsigned rec_len; if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))