ChangeLog, bmove.c, icount.c, inode.c, llseek.c:
llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek()
icount.c (ext2fs_icount_validate):
bmove.c (process_block): Fix lint error in type for fprintf().
inode.c (ext2fs_check_directory): Add support for the callback
to return the error code EXT2_ET_CALLBACK_NOTHANDLED.
ChangeLog, mke2fs.c:
Make parse_raid_opts return a void, to fix a -Wall warning.
diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index 37c47c4..86aa01e 100644
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -84,7 +84,7 @@
{
ext2_inode_scan scan;
errcode_t retval;
- errcode_t (*save_get_blocks)(ext2_filsys fs, ino_t ino, blk_t *blocks);
+ errcode_t (*save_get_blocks)(ext2_filsys f, ino_t ino, blk_t *blocks);
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
@@ -629,8 +629,11 @@
if (ino > fs->super->s_inodes_count)
return EXT2_ET_BAD_INODE_NUM;
- if (fs->check_directory)
- return (fs->check_directory)(fs, ino);
+ if (fs->check_directory) {
+ retval = (fs->check_directory)(fs, ino);
+ if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
+ return retval;
+ }
retval = ext2fs_read_inode(fs, ino, &inode);
if (retval)
return retval;