diff options
| -rw-r--r-- | e2fsprogs/e2fsck.c | 3 | ||||
| -rw-r--r-- | e2fsprogs/ext2fs/ext2fs.h | 1 | ||||
| -rw-r--r-- | e2fsprogs/ext2fs/inode.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index c169ed4..6f3fd7e 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c @@ -2891,7 +2891,7 @@ static void mark_inode_bad(e2fsck_t ctx, ino_t ino); static void handle_fs_bad_blocks(e2fsck_t ctx); static void process_inodes(e2fsck_t ctx, char *block_buf); static int process_inode_cmp(const void *a, const void *b); -static errcode_t scan_callback(ext2_filsys fs, ext2_inode_scan scan, +static errcode_t scan_callback(ext2_filsys fs, dgrp_t group, void * priv_data); static void adjust_extattr_refcount(e2fsck_t ctx, ext2_refcount_t refcount, char *block_buf, int adjust_sign); @@ -3721,7 +3721,6 @@ endit: * glock group, call process_inodes. */ static errcode_t scan_callback(ext2_filsys fs, - ext2_inode_scan scan FSCK_ATTR((unused)), dgrp_t group, void * priv_data) { struct scan_callback_struct *scan_struct; diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h index 76d2ddd..d5a0791 100644 --- a/e2fsprogs/ext2fs/ext2fs.h +++ b/e2fsprogs/ext2fs/ext2fs.h @@ -752,7 +752,6 @@ extern errcode_t ext2fs_inode_scan_goto_blockgroup(ext2_inode_scan scan, extern void ext2fs_set_inode_callback (ext2_inode_scan scan, errcode_t (*done_group)(ext2_filsys fs, - ext2_inode_scan scan, dgrp_t group, void * priv_data), void *done_group_data); diff --git a/e2fsprogs/ext2fs/inode.c b/e2fsprogs/ext2fs/inode.c index db52018..8608dc8 100644 --- a/e2fsprogs/ext2fs/inode.c +++ b/e2fsprogs/ext2fs/inode.c @@ -44,7 +44,6 @@ struct ext2_struct_inode_scan { int bytes_left; char *temp_buffer; errcode_t (*done_group)(ext2_filsys fs, - ext2_inode_scan scan, dgrp_t group, void * priv_data); void * done_group_data; @@ -183,7 +182,6 @@ void ext2fs_close_inode_scan(ext2_inode_scan scan) void ext2fs_set_inode_callback(ext2_inode_scan scan, errcode_t (*done_group)(ext2_filsys fs, - ext2_inode_scan scan, dgrp_t group, void * priv_data), void *done_group_data) @@ -393,7 +391,7 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino, force_new_group: if (scan->done_group) { retval = (scan->done_group) - (scan->fs, scan, scan->current_group, + (scan->fs, scan->current_group, scan->done_group_data); if (retval) return retval; |