Compilation fixes for e2fsprogs
cover Compilation fixes for e2fsprogs
Hi Ted,
in the following emails come fixes of compilation warnings which were
real bugs in the code (mostly harmless but definitely worth a fix).
Honza
PATCH 1/4 e2p: Fix 's' handling in parse_num_blocks2()
parse_num_blocks2() wrongly did:
num << 1;
when log_block_size < 0. That is obviously wrong as such statement has no effect (and the compiler properly warns about it). Callers expect returned value to be in bytes when log_block_size < 0 so fix the statement accordingly.
--- lib/e2p/parse_num.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/e2p/parse_num.c +1 -1
@@ -42,7 +42,7 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)break ;case 's' :if (log_block_size <0 ) - num <<1 ; + num <<=9 ;else num >>= (1 +log_block_size);break ;
Signature · 1 line
1.7.1
Theodore Ts'o
AppliedRe: [1/4] e2p: Fix 's' handling in parse_num_blocks2()
Quoted 8 lines · Jan Kara
parse_num_blocks2()wrongly did:num << 1;when
log_block_size< 0. That is obviously wrong as such statement has no effect (and the compiler properly warns about it). Callers expect returned value to be in bytes whenlog_block_size< 0 so fix the statement accordingly.Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted
PATCH 2/4 libext2fs: Fix return value in ext2fs_test_block_bitmap_range2()
In reply to Jan KaraWe used return without a return value in ext2fs_test_block_bitmap_range2() despite the fuction returns int.
--- lib/ext2fs/gen_bitmap64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/ext2fs/gen_bitmap64.c +1 -1
@@ -658,7 +658,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap bmap,if ((block < bmap->start) || (block+num-1 > bmap->end)) {ext2fs_warn_bitmap (EXT2_ET_BAD_BLOCK_TEST , block, bmap->description); -return ; +return EINVAL ; }return bmap->bitmap_ops->test_clear_bmap_extent (bmap, block, num);
Signature · 1 line
1.7.1
Re: [2/4] libext2fs: Fix return value in ext2fs_test_block_bitmap_range2()
Quoted 4 lines · Jan Kara
We used return without a return value in
ext2fs_test_block_bitmap_range2()despite the fuction returns int.Signed-off-by Jan Kara <[email protected]>
Thanks, this was fixed by commit 0d89e5ace which was submitted by Philipp Thomas last month. It's in the maint branch but not yet in a released version of e2fsprogs yet.,
- Ted
PATCH 3/4 libext2fs: Provide prototype for ext2fs_symlink()
In reply to Jan KaraNew function ext2fs_symlink() doesn't have a prototype in ext2fs.h and thus debugfs compilation gives warning:
debugfs.c:2219:2: warning: implicit declaration of function 'ext2fs_symlink'
--- lib/ext2fs/ext2fs.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
lib/ext2fs/ext2fs.h +4 -0
@@ -1449,6 +1449,10 @@ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,errcode_t ext2fs_unlink (ext2_filsys fs,ext2_ino_t dir,const char *name,ext2_ino_t ino,int flags); +/* symlink.c */ +errcode_t ext2fs_symlink (ext2_filsys fs,ext2_ino_t parent,ext2_ino_t ino, +const char *name,char *target); +/* mmp.c */ errcode_t ext2fs_mmp_read (ext2_filsys fs,blk64_t mmp_blk,void *buf);errcode_t ext2fs_mmp_write (ext2_filsys fs,blk64_t mmp_blk,void *buf);
Signature · 1 line
1.7.1
Theodore Ts'o
AppliedRe: [3/4] libext2fs: Provide prototype for ext2fs_symlink()
Quoted 6 lines · Jan Kara
New function
ext2fs_symlink()doesn't have a prototype inext2fs.hand thus debugfs compilation gives warning:debugfs.c:2219:2: warning: implicit declaration of function '
ext2fs_symlink'Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted
PATCH 4/4 resize: bigalloc_check() should have return type void
In reply to Jan Kara--- resize/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
resize/main.c +1 -1
@@ -147,7 +147,7 @@ static void determine_fs_stride(ext2_filsys fs)#endif } -static bigalloc_check(ext2_filsys fs, int force) +static void bigalloc_check (ext2_filsys fs,int force) {if (!force &&EXT2_HAS_RO_COMPAT_FEATURE (fs->super,EXT4_FEATURE_RO_COMPAT_BIGALLOC )) {
Signature · 1 line
1.7.1
Re: [4/4] resize: bigalloc_check() should have return type void
Quoted 1 line · Jan Kara
Signed-off-by Jan Kara <[email protected]>
This was also fixed by commit 0d89e5ace.
Cheers,
- Ted