X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fpass2.c;h=804770b5e6b2b96af2c6e75ffab18c34cc7f3cb8;hb=2d3df8dc7f5f6970e77ed741e35c88408741a136;hp=1e91e6d01f255964309655406dacda8e9de3d710;hpb=48f23054bb8ad0506c0baa9f06ba182acc2aa88b;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 1e91e6d..804770b 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -42,6 +42,7 @@ */ #define _GNU_SOURCE 1 /* get strnlen() */ +#include "config.h" #include #include "e2fsck.h" @@ -61,17 +62,11 @@ */ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf); static int check_dir_block(ext2_filsys fs, - struct ext2_db_entry *dir_blocks_info, + struct ext2_db_entry2 *dir_blocks_info, void *priv_data); static int allocate_dir_block(e2fsck_t ctx, - struct ext2_db_entry *dir_blocks_info, + struct ext2_db_entry2 *dir_blocks_info, char *buf, struct problem_context *pctx); -static int update_dir_block(ext2_filsys fs, - blk_t *block_nr, - e2_blkcnt_t blockcnt, - blk_t ref_block, - int ref_offset, - void *priv_data); static void clear_htree(e2fsck_t ctx, ext2_ino_t ino); static int htree_depth(struct dx_dir_info *dx_dir, struct dx_dirblock_info *dx_db); @@ -96,6 +91,7 @@ void e2fsck_pass2(e2fsck_t ctx) struct check_dir_struct cd; struct dx_dir_info *dx_dir; struct dx_dirblock_info *dx_db, *dx_parent; + unsigned int save_type; int b; int i, depth; problem_t code; @@ -115,11 +111,15 @@ void e2fsck_pass2(e2fsck_t ctx) &ctx->inode_count); if (ctx->inode_count) cd.pctx.errcode = 0; - else + else { + e2fsck_set_bitmap_type(fs, EXT2FS_BMAP64_RBTREE, + "inode_count", &save_type); cd.pctx.errcode = ext2fs_create_icount2(fs, EXT2_ICOUNT_OPT_INCREMENT, 0, ctx->inode_link_info, &ctx->inode_count); + fs->default_bitmap_type = save_type; + } if (cd.pctx.errcode) { fix_problem(ctx, PR_2_ALLOCATE_ICOUNT, &cd.pctx); ctx->flags |= E2F_FLAG_ABORT; @@ -138,16 +138,16 @@ void e2fsck_pass2(e2fsck_t ctx) cd.buf = buf; cd.ctx = ctx; cd.count = 1; - cd.max = ext2fs_dblist_count(fs->dblist); + cd.max = ext2fs_dblist_count2(fs->dblist); if (ctx->progress) (void) (ctx->progress)(ctx, 2, 0, cd.max); if (fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) - ext2fs_dblist_sort(fs->dblist, special_dir_block_cmp); + ext2fs_dblist_sort2(fs->dblist, special_dir_block_cmp); - cd.pctx.errcode = ext2fs_dblist_iterate(fs->dblist, check_dir_block, - &cd); + cd.pctx.errcode = ext2fs_dblist_iterate2(fs->dblist, check_dir_block, + &cd); if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) return; @@ -302,9 +302,9 @@ static int dict_de_cmp(const void *a, const void *b) int a_len, b_len; de_a = (const struct ext2_dir_entry *) a; - a_len = de_a->name_len & 0xFF; + a_len = ext2fs_dirent_name_len(de_a); de_b = (const struct ext2_dir_entry *) b; - b_len = de_b->name_len & 0xFF; + b_len = ext2fs_dirent_name_len(de_b); if (a_len != b_len) return (a_len - b_len); @@ -320,10 +320,10 @@ static int dict_de_cmp(const void *a, const void *b) */ static EXT2_QSORT_TYPE special_dir_block_cmp(const void *a, const void *b) { - const struct ext2_db_entry *db_a = - (const struct ext2_db_entry *) a; - const struct ext2_db_entry *db_b = - (const struct ext2_db_entry *) b; + const struct ext2_db_entry2 *db_a = + (const struct ext2_db_entry2 *) a; + const struct ext2_db_entry2 *db_b = + (const struct ext2_db_entry2 *) b; if (db_a->blockcnt && !db_b->blockcnt) return 1; @@ -351,13 +351,13 @@ static int check_dot(e2fsck_t ctx, { struct ext2_dir_entry *nextdir; unsigned int rec_len, new_len; - int status = 0; - int created = 0; - int problem = 0; + int status = 0; + int created = 0; + problem_t problem = 0; if (!dirent->inode) problem = PR_2_MISSING_DOT; - else if (((dirent->name_len & 0xFF) != 1) || + else if ((ext2fs_dirent_name_len(dirent) != 1) || (dirent->name[0] != '.')) problem = PR_2_1ST_NOT_DOT; else if (dirent->name[1] != '\0') @@ -369,7 +369,8 @@ static int check_dot(e2fsck_t ctx, if (rec_len < 12) rec_len = dirent->rec_len = 12; dirent->inode = ino; - dirent->name_len = 1; + ext2fs_dirent_set_name_len(dirent, 1); + ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); dirent->name[0] = '.'; dirent->name[1] = '\0'; status = 1; @@ -393,7 +394,9 @@ static int check_dot(e2fsck_t ctx, (void) ext2fs_set_rec_len(ctx->fs, new_len, nextdir); nextdir->inode = 0; - nextdir->name_len = 0; + ext2fs_dirent_set_name_len(nextdir, 0); + ext2fs_dirent_set_file_type(nextdir, + EXT2_FT_UNKNOWN); status = 1; } } @@ -410,11 +413,12 @@ static int check_dotdot(e2fsck_t ctx, struct ext2_dir_entry *dirent, ext2_ino_t ino, struct problem_context *pctx) { - int rec_len, problem = 0; + problem_t problem = 0; + unsigned int rec_len; if (!dirent->inode) problem = PR_2_MISSING_DOT_DOT; - else if (((dirent->name_len & 0xFF) != 2) || + else if ((ext2fs_dirent_name_len(dirent) != 2) || (dirent->name[0] != '.') || (dirent->name[1] != '.')) problem = PR_2_2ND_NOT_DOT_DOT; @@ -432,7 +436,8 @@ static int check_dotdot(e2fsck_t ctx, * inode. This will get fixed in pass 3. */ dirent->inode = EXT2_ROOT_INO; - dirent->name_len = 2; + ext2fs_dirent_set_name_len(dirent, 2); + ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); dirent->name[0] = '.'; dirent->name[1] = '.'; dirent->name[2] = '\0'; @@ -460,7 +465,7 @@ static int check_name(e2fsck_t ctx, int fixup = -1; int ret = 0; - for ( i = 0; i < (dirent->name_len & 0xFF); i++) { + for ( i = 0; i < ext2fs_dirent_name_len(dirent); i++) { if (dirent->name[i] == '/' || dirent->name[i] == '\0') { if (fixup < 0) { fixup = fix_problem(ctx, PR_2_BAD_NAME, pctx); @@ -482,7 +487,7 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, ext2_ino_t dir_ino EXT2FS_ATTR((unused)), struct problem_context *pctx) { - int filetype = dirent->name_len >> 8; + int filetype = ext2fs_dirent_file_type(dirent); int should_be = EXT2_FT_UNKNOWN; struct ext2_inode inode; @@ -491,7 +496,7 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, if (filetype == 0 || !fix_problem(ctx, PR_2_CLEAR_FILETYPE, pctx)) return 0; - dirent->name_len = dirent->name_len & 0xFF; + ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); return 1; } @@ -517,16 +522,16 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, pctx) == 0) return 0; - dirent->name_len = (dirent->name_len & 0xFF) | should_be << 8; + ext2fs_dirent_set_file_type(dirent, should_be); return 1; } #ifdef ENABLE_HTREE static void parse_int_node(ext2_filsys fs, - struct ext2_db_entry *db, + struct ext2_db_entry2 *db, struct check_dir_struct *cd, struct dx_dir_info *dx_dir, - char *block_buf) + char *block_buf, int failed_csum) { struct ext2_dx_root_info *root; struct ext2_dx_entry *ent; @@ -537,6 +542,7 @@ static void parse_int_node(ext2_filsys fs, ext2_dirhash_t min_hash = 0xffffffff; ext2_dirhash_t max_hash = 0; ext2_dirhash_t hash = 0, prev_hash; + int csum_size = 0; if (db->blockcnt == 0) { root = (struct ext2_dx_root_info *) (block_buf + 24); @@ -551,9 +557,22 @@ static void parse_int_node(ext2_filsys fs, #endif ent = (struct ext2_dx_entry *) (block_buf + 24 + root->info_length); + + if (failed_csum && + (e2fsck_dir_will_be_rehashed(cd->ctx, cd->pctx.ino) || + fix_problem(cd->ctx, PR_2_HTREE_ROOT_CSUM_INVALID, + &cd->pctx))) + goto clear_and_exit; } else { ent = (struct ext2_dx_entry *) (block_buf+8); + + if (failed_csum && + (e2fsck_dir_will_be_rehashed(cd->ctx, cd->pctx.ino) || + fix_problem(cd->ctx, PR_2_HTREE_NODE_CSUM_INVALID, + &cd->pctx))) + goto clear_and_exit; } + limit = (struct ext2_dx_countlimit *) ent; #ifdef DX_DEBUG @@ -564,8 +583,12 @@ static void parse_int_node(ext2_filsys fs, #endif count = ext2fs_le16_to_cpu(limit->count); - expect_limit = (fs->blocksize - ((char *) ent - block_buf)) / - sizeof(struct ext2_dx_entry); + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) + csum_size = sizeof(struct ext2_dx_tail); + expect_limit = (fs->blocksize - + (csum_size + ((char *) ent - block_buf))) / + sizeof(struct ext2_dx_entry); if (ext2fs_le16_to_cpu(limit->limit) != expect_limit) { cd->pctx.num = ext2fs_le16_to_cpu(limit->limit); if (fix_problem(cd->ctx, PR_2_HTREE_BAD_LIMIT, &cd->pctx)) @@ -631,6 +654,7 @@ static void parse_int_node(ext2_filsys fs, clear_and_exit: clear_htree(cd->ctx, cd->pctx.ino); dx_dir->numblocks = 0; + e2fsck_rehash_dir_later(cd->ctx, cd->pctx.ino); } #endif /* ENABLE_HTREE */ @@ -646,7 +670,7 @@ static void salvage_directory(ext2_filsys fs, char *cp = (char *) dirent; int left; unsigned int rec_len, prev_rec_len; - unsigned int name_len = dirent->name_len & 0xFF; + unsigned int name_len = ext2fs_dirent_name_len(dirent); (void) ext2fs_get_rec_len(fs, dirent, &rec_len); left = fs->blocksize - *offset - rec_len; @@ -667,7 +691,7 @@ static void salvage_directory(ext2_filsys fs, */ if ((left < 0) && ((int) rec_len + left > 8) && - (name_len + 8 <= (int) rec_len + left) && + ((int) name_len + 8 <= (int) rec_len + left) && dirent->inode <= fs->super->s_inodes_count && strnlen(dirent->name, name_len) == name_len) { (void) ext2fs_set_rec_len(fs, (int) rec_len + left, dirent); @@ -700,13 +724,14 @@ static void salvage_directory(ext2_filsys fs, } else { rec_len = fs->blocksize - *offset; (void) ext2fs_set_rec_len(fs, rec_len, dirent); - dirent->name_len = 0; + ext2fs_dirent_set_name_len(dirent, 0); + ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); dirent->inode = 0; } } static int check_dir_block(ext2_filsys fs, - struct ext2_db_entry *db, + struct ext2_db_entry2 *db, void *priv_data) { struct dx_dir_info *dx_dir; @@ -716,24 +741,26 @@ static int check_dir_block(ext2_filsys fs, struct ext2_dir_entry *dirent, *prev; ext2_dirhash_t hash; unsigned int offset = 0; - const char * old_op; int dir_modified = 0; int dot_state; unsigned int rec_len; - blk_t block_nr = db->blk; + blk64_t block_nr = db->blk; ext2_ino_t ino = db->ino; ext2_ino_t subdir_parent; __u16 links; struct check_dir_struct *cd; char *buf; e2fsck_t ctx; - int problem; + problem_t problem; struct ext2_dx_root_info *root; struct ext2_dx_countlimit *limit; static dict_t de_dict; struct problem_context pctx; int dups_found = 0; int ret; + int dx_csum_size = 0, de_csum_size = 0; + int failed_csum = 0; + int is_leaf = 1; cd = (struct check_dir_struct *) priv_data; buf = cd->buf; @@ -745,6 +772,12 @@ static int check_dir_block(ext2_filsys fs, if (ctx->progress && (ctx->progress)(ctx, 2, cd->count++, cd->max)) return DIRENT_ABORT; + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) { + dx_csum_size = sizeof(struct ext2_dx_tail); + de_csum_size = sizeof(struct ext2_dir_entry_tail); + } + /* * Make sure the inode is still in use (could have been * deleted in the duplicate/bad blocks pass. @@ -779,17 +812,25 @@ static int check_dir_block(ext2_filsys fs, db->blockcnt, ino); #endif - old_op = ehandler_operation(_("reading directory block")); - cd->pctx.errcode = ext2fs_read_dir_block(fs, block_nr, buf); + ehandler_operation(_("reading directory block")); + cd->pctx.errcode = ext2fs_read_dir_block4(fs, block_nr, buf, 0, ino); ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) cd->pctx.errcode = 0; /* We'll handle this ourselves */ + else if (cd->pctx.errcode == EXT2_ET_DIR_CSUM_INVALID) { + cd->pctx.errcode = 0; /* We'll handle this ourselves */ + failed_csum = 1; + } if (cd->pctx.errcode) { + char *buf2; if (!fix_problem(ctx, PR_2_READ_DIRBLOCK, &cd->pctx)) { ctx->flags |= E2F_FLAG_ABORT; return DIRENT_ABORT; } - memset(buf, 0, fs->blocksize); + ext2fs_new_dir_block(fs, db->blockcnt == 0 ? ino : 0, + EXT2_ROOT_INO, &buf2); + memcpy(buf, buf2, fs->blocksize); + ext2fs_free_mem(&buf2); } #ifdef ENABLE_HTREE dx_dir = e2fsck_get_dx_dir_info(ctx, ino); @@ -832,20 +873,54 @@ static int check_dir_block(ext2_filsys fs, dx_dir->depth = root->indirect_levels + 1; } else if ((dirent->inode == 0) && (rec_len == fs->blocksize) && - (dirent->name_len == 0) && + (ext2fs_dirent_name_len(dirent) == 0) && (ext2fs_le16_to_cpu(limit->limit) == - ((fs->blocksize-8) / + ((fs->blocksize - (8 + dx_csum_size)) / sizeof(struct ext2_dx_entry)))) dx_db->type = DX_DIRBLOCK_NODE; + is_leaf = 0; } out_htree: #endif /* ENABLE_HTREE */ + /* Verify checksum. */ + if (is_leaf && de_csum_size) { + /* No space for csum? Rebuild dirs in pass 3A. */ + if (!ext2fs_dirent_has_tail(fs, (struct ext2_dir_entry *)buf)) { + de_csum_size = 0; + if (e2fsck_dir_will_be_rehashed(ctx, ino)) + goto skip_checksum; + if (!fix_problem(cd->ctx, PR_2_LEAF_NODE_MISSING_CSUM, + &cd->pctx)) + goto skip_checksum; + e2fsck_rehash_dir_later(ctx, ino); + goto skip_checksum; + } + if (failed_csum) { + char *buf2; + if (!fix_problem(cd->ctx, PR_2_LEAF_NODE_CSUM_INVALID, + &cd->pctx)) + goto skip_checksum; + ext2fs_new_dir_block(fs, + db->blockcnt == 0 ? ino : 0, + EXT2_ROOT_INO, &buf2); + memcpy(buf, buf2, fs->blocksize); + ext2fs_free_mem(&buf2); + dir_modified++; + failed_csum = 0; + } + } + /* htree nodes don't use fake dirents to store checksums */ + if (!is_leaf) + de_csum_size = 0; + +skip_checksum: dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp); prev = 0; do { - int group; + dgrp_t group; ext2_ino_t first_unused_inode; + unsigned int name_len; problem = 0; dirent = (struct ext2_dir_entry *) (buf + offset); @@ -855,7 +930,7 @@ out_htree: if (((offset + rec_len) > fs->blocksize) || (rec_len < 12) || ((rec_len % 4) != 0) || - (((dirent->name_len & (unsigned) 0xFF)+8) > rec_len)) { + ((ext2fs_dirent_name_len(dirent) + 8) > rec_len)) { if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) { salvage_directory(fs, dirent, prev, &offset); dir_modified++; @@ -863,12 +938,6 @@ out_htree: } else goto abort_free_dict; } - if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) { - if (fix_problem(ctx, PR_2_FILENAME_LONG, &cd->pctx)) { - dirent->name_len = EXT2_NAME_LEN; - dir_modified++; - } - } if (dot_state == 0) { if (check_dot(ctx, dirent, ino, &cd->pctx)) @@ -893,6 +962,7 @@ out_htree: /* * Make sure the inode listed is a legal one. */ + name_len = ext2fs_dirent_name_len(dirent); if (((dirent->inode != EXT2_ROOT_INO) && (dirent->inode < EXT2_FIRST_INODE(fs->super))) || (dirent->inode > fs->super->s_inodes_count)) { @@ -905,8 +975,7 @@ out_htree: * clear it. */ problem = PR_2_BB_INODE; - } else if ((dot_state > 1) && - ((dirent->name_len & 0xFF) == 1) && + } else if ((dot_state > 1) && (name_len == 1) && (dirent->name[0] == '.')) { /* * If there's a '.' entry in anything other @@ -914,8 +983,7 @@ out_htree: * duplicate entry that should be removed. */ problem = PR_2_DUP_DOT; - } else if ((dot_state > 1) && - ((dirent->name_len & 0xFF) == 2) && + } else if ((dot_state > 1) && (name_len == 2) && (dirent->name[0] == '.') && (dirent->name[1] == '.')) { /* @@ -933,8 +1001,7 @@ out_htree: * directory hasn't been created yet. */ problem = PR_2_LINK_ROOT; - } else if ((dot_state > 1) && - (dirent->name_len & 0xFF) == 0) { + } else if ((dot_state > 1) && (name_len == 0)) { /* * Don't allow zero-length directory names. */ @@ -1013,13 +1080,18 @@ out_htree: } } - if (!(ext2fs_test_inode_bitmap2(ctx->inode_used_map, - dirent->inode))) { - /* - * If the inode is unused, offer to clear it. - */ + /* + * Offer to clear unused inodes; if we are going to be + * restarting the scan due to bg_itable_unused being + * wrong, then don't clear any inodes to avoid zapping + * inodes that were skipped during pass1 due to an + * incorrect bg_itable_unused; we'll get any real + * problems after we restart. + */ + if (!(ctx->flags & E2F_FLAG_RESTART_LATER) && + !(ext2fs_test_inode_bitmap2(ctx->inode_used_map, + dirent->inode))) problem = PR_2_UNUSED_INODE; - } if (problem) { if (fix_problem(ctx, problem, &cd->pctx)) { @@ -1042,7 +1114,7 @@ out_htree: #ifdef ENABLE_HTREE if (dx_db) { ext2fs_dirhash(dx_dir->hashversion, dirent->name, - (dirent->name_len & 0xFF), + ext2fs_dirent_name_len(dirent), fs->super->s_hash_seed, &hash, 0); if (hash < dx_db->min_hash) dx_db->min_hash = hash; @@ -1089,10 +1161,7 @@ out_htree: pctx.ino = ino; pctx.dirent = dirent; fix_problem(ctx, PR_2_REPORT_DUP_DIRENT, &pctx); - if (!ctx->dirs_to_hash) - ext2fs_u32_list_create(&ctx->dirs_to_hash, 50); - if (ctx->dirs_to_hash) - ext2fs_u32_list_add(ctx->dirs_to_hash, ino); + e2fsck_rehash_dir_later(ctx, ino); dups_found++; } else dict_alloc_insert(&de_dict, dirent, dirent); @@ -1108,7 +1177,7 @@ out_htree: (void) ext2fs_get_rec_len(fs, dirent, &rec_len); offset += rec_len; dot_state++; - } while (offset < fs->blocksize); + } while (offset < fs->blocksize - de_csum_size); #if 0 printf("\n"); #endif @@ -1122,24 +1191,47 @@ out_htree: cd->pctx.dir = cd->pctx.ino; if ((dx_db->type == DX_DIRBLOCK_ROOT) || (dx_db->type == DX_DIRBLOCK_NODE)) - parse_int_node(fs, db, cd, dx_dir, buf); + parse_int_node(fs, db, cd, dx_dir, buf, failed_csum); } #endif /* ENABLE_HTREE */ - if (offset != fs->blocksize) { - cd->pctx.num = rec_len - fs->blocksize + offset; + + if (offset != fs->blocksize - de_csum_size) { + cd->pctx.num = rec_len - (fs->blocksize - de_csum_size) + + offset; if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { dirent->rec_len = cd->pctx.num; dir_modified++; } } if (dir_modified) { - cd->pctx.errcode = ext2fs_write_dir_block(fs, block_nr, buf); + /* leaf block with no tail? Rehash dirs later. */ + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) && + is_leaf && + !ext2fs_dirent_has_tail(fs, (struct ext2_dir_entry *)buf)) + e2fsck_rehash_dir_later(ctx, ino); + +write_and_fix: + if (e2fsck_dir_will_be_rehashed(ctx, ino)) + ctx->fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; + cd->pctx.errcode = ext2fs_write_dir_block4(fs, block_nr, buf, + 0, ino); + if (e2fsck_dir_will_be_rehashed(ctx, ino)) + ctx->fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS; if (cd->pctx.errcode) { if (!fix_problem(ctx, PR_2_WRITE_DIRBLOCK, &cd->pctx)) goto abort_free_dict; } ext2fs_mark_changed(fs); + } else if (is_leaf && failed_csum && !dir_modified) { + /* + * If a leaf node that fails csum makes it this far without + * alteration, ask the user if the checksum should be fixed. + */ + if (fix_problem(ctx, PR_2_LEAF_NODE_ONLY_CSUM_INVALID, + &cd->pctx)) + goto write_and_fix; } dict_free_nodes(&de_dict); return 0; @@ -1149,26 +1241,32 @@ abort_free_dict: return DIRENT_ABORT; } +struct del_block { + e2fsck_t ctx; + e2_blkcnt_t num; +}; + /* * This function is called to deallocate a block, and is an interator * functioned called by deallocate inode via ext2fs_iterate_block(). */ static int deallocate_inode_block(ext2_filsys fs, - blk_t *block_nr, + blk64_t *block_nr, e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), - blk_t ref_block EXT2FS_ATTR((unused)), + blk64_t ref_block EXT2FS_ATTR((unused)), int ref_offset EXT2FS_ATTR((unused)), void *priv_data) { - e2fsck_t ctx = (e2fsck_t) priv_data; + struct del_block *p = priv_data; if (HOLE_BLKADDR(*block_nr)) return 0; if ((*block_nr < fs->super->s_first_data_block) || (*block_nr >= ext2fs_blocks_count(fs->super))) return 0; - ext2fs_unmark_block_bitmap2(ctx->block_found_map, *block_nr); + ext2fs_unmark_block_bitmap2(p->ctx->block_found_map, *block_nr); ext2fs_block_alloc_stats2(fs, *block_nr, -1); + p->num++; return 0; } @@ -1181,9 +1279,9 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) struct ext2_inode inode; struct problem_context pctx; __u32 count; + struct del_block del_block; e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode"); - e2fsck_clear_inode(ctx, ino, &inode, 0, "deallocate_inode"); clear_problem_context(&pctx); pctx.ino = ino; @@ -1193,44 +1291,51 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) e2fsck_read_bitmaps(ctx); ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); - if (ext2fs_file_acl_block(&inode) && + if (ext2fs_file_acl_block(fs, &inode) && (fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) { - pctx.errcode = ext2fs_adjust_ea_refcount(fs, ext2fs_file_acl_block(&inode), - block_buf, -1, &count); + pctx.errcode = ext2fs_adjust_ea_refcount3(fs, + ext2fs_file_acl_block(fs, &inode), + block_buf, -1, &count, ino); if (pctx.errcode == EXT2_ET_BAD_EA_BLOCK_NUM) { pctx.errcode = 0; count = 1; } if (pctx.errcode) { - pctx.blk = ext2fs_file_acl_block(&inode); + pctx.blk = ext2fs_file_acl_block(fs, &inode); fix_problem(ctx, PR_2_ADJ_EA_REFCOUNT, &pctx); ctx->flags |= E2F_FLAG_ABORT; return; } if (count == 0) { ext2fs_unmark_block_bitmap2(ctx->block_found_map, - ext2fs_file_acl_block(&inode)); + ext2fs_file_acl_block(fs, &inode)); ext2fs_block_alloc_stats2(fs, - ext2fs_file_acl_block(&inode), - -1); + ext2fs_file_acl_block(fs, &inode), -1); } - ext2fs_file_acl_block_set(&inode, 0); + ext2fs_file_acl_block_set(fs, &inode, 0); } - if (!ext2fs_inode_has_valid_blocks(&inode)) - return; + if (!ext2fs_inode_has_valid_blocks2(fs, &inode)) + goto clear_inode; if (LINUX_S_ISREG(inode.i_mode) && - (inode.i_size_high || inode.i_size & 0x80000000UL)) + ext2fs_needs_large_file_feature(EXT2_I_SIZE(&inode))) ctx->large_files--; - pctx.errcode = ext2fs_block_iterate2(fs, ino, 0, block_buf, - deallocate_inode_block, ctx); + del_block.ctx = ctx; + del_block.num = 0; + pctx.errcode = ext2fs_block_iterate3(fs, ino, 0, block_buf, + deallocate_inode_block, + &del_block); if (pctx.errcode) { fix_problem(ctx, PR_2_DEALLOC_INODE, &pctx); ctx->flags |= E2F_FLAG_ABORT; return; } +clear_inode: + /* Inode may have changed by block_iterate, so reread it */ + e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode"); + e2fsck_clear_inode(ctx, ino, &inode, 0, "deallocate_inode"); } /* @@ -1257,7 +1362,7 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, int not_fixed = 0; unsigned char *frag, *fsize; struct problem_context pctx; - int problem = 0; + problem_t problem = 0; e2fsck_read_inode(ctx, ino, &inode, "process_bad_inode"); @@ -1266,10 +1371,10 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, pctx.dir = dir; pctx.inode = &inode; - if (ext2fs_file_acl_block(&inode) && + if (ext2fs_file_acl_block(fs, &inode) && !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) { if (fix_problem(ctx, PR_2_FILE_ACL_ZERO, &pctx)) { - ext2fs_file_acl_block_set(&inode, 0); + ext2fs_file_acl_block_set(fs, &inode, 0); inode_modified++; } else not_fixed++; @@ -1365,11 +1470,11 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, not_fixed++; } - if (ext2fs_file_acl_block(&inode) && - ((ext2fs_file_acl_block(&inode) < fs->super->s_first_data_block) || - (ext2fs_file_acl_block(&inode) >= ext2fs_blocks_count(fs->super)))) { + if (ext2fs_file_acl_block(fs, &inode) && + ((ext2fs_file_acl_block(fs, &inode) < fs->super->s_first_data_block) || + (ext2fs_file_acl_block(fs, &inode) >= ext2fs_blocks_count(fs->super)))) { if (fix_problem(ctx, PR_2_FILE_ACL_BAD, &pctx)) { - ext2fs_file_acl_block_set(&inode, 0); + ext2fs_file_acl_block_set(fs, &inode, 0); inode_modified++; } else not_fixed++; @@ -1398,7 +1503,7 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, * that was zeroed out and now needs to be replaced. */ static int allocate_dir_block(e2fsck_t ctx, - struct ext2_db_entry *db, + struct ext2_db_entry2 *db, char *buf EXT2FS_ATTR((unused)), struct problem_context *pctx) { @@ -1444,7 +1549,7 @@ static int allocate_dir_block(e2fsck_t ctx, return 1; } - pctx->errcode = ext2fs_write_dir_block(fs, blk, block); + pctx->errcode = ext2fs_write_dir_block4(fs, blk, block, 0, db->ino); ext2fs_free_mem(&block); if (pctx->errcode) { pctx->str = "ext2fs_write_dir_block"; @@ -1465,8 +1570,8 @@ static int allocate_dir_block(e2fsck_t ctx, * Finally, update the block pointers for the inode */ db->blk = blk; - pctx->errcode = ext2fs_block_iterate2(fs, db->ino, BLOCK_FLAG_HOLE, - 0, update_dir_block, db); + pctx->errcode = ext2fs_bmap2(fs, db->ino, &inode, 0, BMAP_SET, + db->blockcnt, 0, &blk); if (pctx->errcode) { pctx->str = "ext2fs_block_iterate"; fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx); @@ -1475,23 +1580,3 @@ static int allocate_dir_block(e2fsck_t ctx, return 0; } - -/* - * This is a helper function for allocate_dir_block(). - */ -static int update_dir_block(ext2_filsys fs EXT2FS_ATTR((unused)), - blk_t *block_nr, - e2_blkcnt_t blockcnt, - blk_t ref_block EXT2FS_ATTR((unused)), - int ref_offset EXT2FS_ATTR((unused)), - void *priv_data) -{ - struct ext2_db_entry *db; - - db = (struct ext2_db_entry *) priv_data; - if (db->blockcnt == (int) blockcnt) { - *block_nr = db->blk; - return BLOCK_CHANGED; - } - return 0; -}