diff options
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/journal.c | 12 | ||||
| -rw-r--r-- | e2fsck/pass1.c | 8 | ||||
| -rw-r--r-- | e2fsck/rehash.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index bb86f528..8ae89bf7 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -578,7 +578,7 @@ static int ext4_del_extent_from_list(e2fsck_t ctx, struct extent_list *list, return ext4_modify_extent_list(ctx, list, ex, 1 /* delete */); } -static int ext4_fc_read_extents(e2fsck_t ctx, ino_t ino) +static int ext4_fc_read_extents(e2fsck_t ctx, ext2_ino_t ino) { struct extent_list *extent_list = &ctx->fc_replay_state.fc_extent_list; @@ -597,7 +597,7 @@ static int ext4_fc_read_extents(e2fsck_t ctx, ino_t ino) * for the inode so that we can flush all of them at once and it also saves us * from continuously growing and shrinking the extent tree. */ -static void ext4_fc_flush_extents(e2fsck_t ctx, ino_t ino) +static void ext4_fc_flush_extents(e2fsck_t ctx, ext2_ino_t ino) { struct extent_list *extent_list = &ctx->fc_replay_state.fc_extent_list; @@ -610,9 +610,9 @@ static void ext4_fc_flush_extents(e2fsck_t ctx, ino_t ino) /* Helper struct for dentry replay routines */ struct dentry_info_args { - ino_t parent_ino; + ext2_ino_t parent_ino; int dname_len; - ino_t ino; + ext2_ino_t ino; char *dname; }; @@ -634,7 +634,7 @@ static inline int tl_to_darg(struct dentry_info_args *darg, val + sizeof(struct ext4_fc_dentry_info), darg->dname_len); darg->dname[darg->dname_len] = 0; - jbd_debug(1, "%s: %s, ino %lu, parent %lu\n", + jbd_debug(1, "%s: %s, ino %u, parent %u\n", le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_CREAT ? "create" : (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_LINK ? "link" : (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_UNLINK ? "unlink" : @@ -809,7 +809,7 @@ static int ext4_fc_handle_add_extent(e2fsck_t ctx, __u8 *val) { struct ext2fs_extent extent; struct ext4_fc_add_range add_range; - ino_t ino; + ext2_ino_t ino; int ret = 0; memcpy(&add_range, val, sizeof(add_range)); diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index f8dcf61a..bcf337c2 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -79,8 +79,8 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, static void mark_table_blocks(e2fsck_t ctx); static void alloc_bb_map(e2fsck_t ctx); static void alloc_imagic_map(e2fsck_t ctx); -static void mark_inode_bad(e2fsck_t ctx, ino_t ino); -static void add_casefolded_dir(e2fsck_t ctx, ino_t ino); +static void mark_inode_bad(e2fsck_t ctx, ext2_ino_t ino); +static void add_casefolded_dir(e2fsck_t ctx, ext2_ino_t ino); static void handle_fs_bad_blocks(e2fsck_t ctx); static void process_inodes(e2fsck_t ctx, char *block_buf); static EXT2_QSORT_TYPE process_inode_cmp(const void *a, const void *b); @@ -2205,7 +2205,7 @@ static EXT2_QSORT_TYPE process_inode_cmp(const void *a, const void *b) /* * Mark an inode as being bad in some what */ -static void mark_inode_bad(e2fsck_t ctx, ino_t ino) +static void mark_inode_bad(e2fsck_t ctx, ext2_ino_t ino) { struct problem_context pctx; @@ -2226,7 +2226,7 @@ static void mark_inode_bad(e2fsck_t ctx, ino_t ino) ext2fs_mark_inode_bitmap2(ctx->inode_bad_map, ino); } -static void add_casefolded_dir(e2fsck_t ctx, ino_t ino) +static void add_casefolded_dir(e2fsck_t ctx, ext2_ino_t ino) { struct problem_context pctx; diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c index c79a5acf..8235e468 100644 --- a/e2fsck/rehash.c +++ b/e2fsck/rehash.c @@ -91,7 +91,7 @@ struct fill_dir_struct { struct hash_entry { ext2_dirhash_t hash; ext2_dirhash_t minor_hash; - ino_t ino; + ext2_ino_t ino; struct ext2_dir_entry *dir; }; |