On Tue, Dec 03, 2013 at 12:10:13AM -0500, Theodore Ts'o wrote: > Add some explicit casts to silence some -Wconversion noise. > > Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx> > --- > lib/ext2fs/ext2fs.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h > index b7a784e..eb1901e 100644 > --- a/lib/ext2fs/ext2fs.h > +++ b/lib/ext2fs/ext2fs.h > @@ -1673,14 +1673,14 @@ _INLINE_ int ext2fs_test_bb_dirty(ext2_filsys fs) > /* > * Return the group # of a block > */ > -_INLINE_ int ext2fs_group_of_blk(ext2_filsys fs, blk_t blk) > +_INLINE_ dgrp_t ext2fs_group_of_blk(ext2_filsys fs, blk_t blk) The function prototypes up around line 1604 need to be updated: In file included from inline.c:38:0: ext2fs.h:1810:17: error: conflicting types for ‘ext2fs_group_of_blk’ ext2fs.h:1604:12: note: previous declaration of ‘ext2fs_group_of_blk’ was here ext2fs.h:1817:17: error: conflicting types for ‘ext2fs_group_of_ino’ ext2fs.h:1605:12: note: previous declaration of ‘ext2fs_group_of_ino’ was here --D --- libext2fs: fix function declarations to match definition Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --- lib/ext2fs/ext2fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index f9b795a..898ad0c 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -1601,8 +1601,8 @@ extern void ext2fs_mark_ib_dirty(ext2_filsys fs); extern void ext2fs_mark_bb_dirty(ext2_filsys fs); extern int ext2fs_test_ib_dirty(ext2_filsys fs); extern int ext2fs_test_bb_dirty(ext2_filsys fs); -extern int ext2fs_group_of_blk(ext2_filsys fs, blk_t blk); -extern int ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino); +extern dgrp_t ext2fs_group_of_blk(ext2_filsys fs, blk_t blk); +extern dgrp_t ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino); extern blk_t ext2fs_group_first_block(ext2_filsys fs, dgrp_t group); extern blk_t ext2fs_group_last_block(ext2_filsys fs, dgrp_t group); extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs, -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
