X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fpass2.c;h=2aad1ae14f7bf42960d7932c5cf1c1a3d8948159;hb=03828933748fe390a39f0ae3019c3f93191eb1b7;hp=f5a326d3285823e71b5076004b2732949ea1b38a;hpb=23f75f6efaac6b756e0f3e4e1d33b6798347f66a;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index f5a326d..2aad1ae 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -33,15 +33,15 @@ * Pass 2 relies on the following information from previous passes: * - The directory information collected in pass 1. * - The inode_used_map bitmap - * - The inode_bad_map bitmap + * - The inode_badness bitmap * - The inode_dir_map bitmap * * Pass 2 frees the following data structures - * - The inode_bad_map bitmap * - The inode_reg_map bitmap */ #define _GNU_SOURCE 1 /* get strnlen() */ +#include "config.h" #include #include "e2fsck.h" @@ -61,17 +61,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 +90,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 +110,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,24 +137,24 @@ 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); - - cd.pctx.errcode = ext2fs_dblist_iterate(fs->dblist, check_dir_block, - &cd); - if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) - return; + ext2fs_dblist_sort2(fs->dblist, special_dir_block_cmp); + cd.pctx.errcode = ext2fs_dblist_iterate2(fs->dblist, check_dir_block, + &cd); if (ctx->flags & E2F_FLAG_RESTART_LATER) { ctx->flags |= E2F_FLAG_RESTART; - return; + ctx->flags &= ~E2F_FLAG_RESTART_LATER; } + if (ctx->flags & E2F_FLAG_RUN_RETURN) + return; + if (cd.pctx.errcode) { fix_problem(ctx, PR_2_DBLIST_ITERATE, &cd.pctx); ctx->flags |= E2F_FLAG_ABORT; @@ -243,8 +242,6 @@ void e2fsck_pass2(e2fsck_t ctx) fix_problem(ctx, code, &pctx); bad_dir++; } - if (code == 0) - continue; } if (bad_dir && fix_problem(ctx, PR_2_HTREE_CLEAR, &pctx)) { clear_htree(ctx, dx_dir->ino); @@ -256,10 +253,6 @@ void e2fsck_pass2(e2fsck_t ctx) ext2fs_free_mem(&buf); ext2fs_free_dblist(fs->dblist); - if (ctx->inode_bad_map) { - ext2fs_free_inode_bitmap(ctx->inode_bad_map); - ctx->inode_bad_map = 0; - } if (ctx->inode_reg_map) { ext2fs_free_inode_bitmap(ctx->inode_reg_map); ctx->inode_reg_map = 0; @@ -322,10 +315,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; @@ -342,20 +335,93 @@ static EXT2_QSORT_TYPE special_dir_block_cmp(const void *a, const void *b) return (int) (db_a->blockcnt - db_b->blockcnt); } +void ext2_fix_dirent_dirdata(struct ext2_dir_entry *de) +{ + __u16 file_type = de->name_len & (EXT2_FT_MASK << 8); + __u8 de_flags = (de->name_len >> 8) & ~EXT2_FT_MASK; + __u8 name_len = de->name_len & EXT2_NAME_LEN; + __u8 new_flag = 0; + int i; + + for (i = 0; i < 4; i++) { + __u8 flags = new_flag | (1 << i) << 4; + + /* new_flag is accumulating flags that are set in de_flags + * and still fit inside rec_len. ext2_get_dirent_dirdata_size() + * returns the size of all the dirdata entries in flags, and + * chops off any that are beyond rec_len. */ + if ((de_flags & flags) == flags) { + int dirdatalen = ext2_get_dirent_dirdata_size(de,flags); + int rlen = __EXT2_DIR_REC_LEN(name_len + dirdatalen); + + if (rlen > de->rec_len) + break; + + new_flag |= flags; + } + } + + de->name_len = name_len | file_type | (new_flag << 8); +} /* + * check for dirent data in ext3 dirent. + * return 0 if dirent data is ok. + * return 1 if dirent data does not exist. + * return 2 if dirent was modified due to error. + */ +int e2fsck_check_dirent_data(e2fsck_t ctx, struct ext2_dir_entry *de, + unsigned int offset, struct problem_context *pctx) +{ + if (!(ctx->fs->super->s_feature_incompat & + EXT4_FEATURE_INCOMPAT_DIRDATA)) { + if ((de->name_len >> 8) & ~EXT2_FT_MASK) { + /* clear dirent extra data flags. */ + if (fix_problem(ctx, PR_2_CLEAR_DIRDATA, pctx)) { + de->name_len &= (EXT2_FT_MASK << 8) | + EXT2_NAME_LEN; + return 2; + } + } + return 1; + } + if ((de->name_len >> 8) & ~EXT2_FT_MASK) { + if (de->rec_len >= EXT2_DIR_REC_LEN(de) || + de->rec_len + offset == EXT2_BLOCK_SIZE(ctx->fs->super)) { + if (ext2_get_dirent_dirdata_size(de, + EXT2_DIRENT_LUFID) == + EXT2_DIRENT_LUFID_SIZE) + return 0; + } + /* just clear dirent data flags for now, we should fix FID data + * in lustre specific pass. + */ + if (fix_problem(ctx, PR_2_CLEAR_DIRDATA, pctx)) { + ext2_fix_dirent_dirdata(de); + if (ext2_get_dirent_dirdata_size(de, + EXT2_DIRENT_LUFID) != + EXT2_DIRENT_LUFID_SIZE) + de->name_len &= ~(EXT2_DIRENT_LUFID << 8); + + return 2; + } + } + return 1; +} +/* * Make sure the first entry in the directory is '.', and that the * directory entry is sane. */ static int check_dot(e2fsck_t ctx, - struct ext2_dir_entry *dirent, + struct ext2_dir_entry *dirent, unsigned int offset, ext2_ino_t ino, struct problem_context *pctx) { struct ext2_dir_entry *nextdir; - int status = 0; - int created = 0; - int rec_len, new_len; - int problem = 0; + unsigned int rec_len, new_len; + int status = 0; + int created = 0; + problem_t problem = 0; + int dir_data_error; if (!dirent->inode) problem = PR_2_MISSING_DOT; @@ -365,11 +431,12 @@ static int check_dot(e2fsck_t ctx, else if (dirent->name[1] != '\0') problem = PR_2_DOT_NULL_TERM; - rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ? - dirent->rec_len : 65536; + dir_data_error = e2fsck_check_dirent_data(ctx, dirent, offset, pctx); + + (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { if (fix_problem(ctx, problem, pctx)) { - if (rec_len < 12) + if (rec_len < 12 && dir_data_error) rec_len = dirent->rec_len = 12; dirent->inode = ino; dirent->name_len = 1; @@ -385,7 +452,7 @@ static int check_dot(e2fsck_t ctx, status = 1; } } - if (rec_len > 12) { + if (rec_len > 12 && dir_data_error) { new_len = rec_len - 12; if (new_len > 12) { if (created || @@ -393,7 +460,8 @@ static int check_dot(e2fsck_t ctx, nextdir = (struct ext2_dir_entry *) ((char *) dirent + 12); dirent->rec_len = 12; - nextdir->rec_len = new_len; + (void) ext2fs_set_rec_len(ctx->fs, new_len, + nextdir); nextdir->inode = 0; nextdir->name_len = 0; status = 1; @@ -409,10 +477,12 @@ static int check_dot(e2fsck_t ctx, * here; this gets done in pass 3. */ static int check_dotdot(e2fsck_t ctx, - struct ext2_dir_entry *dirent, + struct ext2_dir_entry *dirent, unsigned int offset, ext2_ino_t ino, struct problem_context *pctx) { - int rec_len, problem = 0; + problem_t problem = 0; + unsigned int rec_len; + int dir_data_error; if (!dirent->inode) problem = PR_2_MISSING_DOT_DOT; @@ -423,11 +493,12 @@ static int check_dotdot(e2fsck_t ctx, else if (dirent->name[2] != '\0') problem = PR_2_DOT_DOT_NULL_TERM; - rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ? - dirent->rec_len : 65536; + dir_data_error = e2fsck_check_dirent_data(ctx, dirent, offset, pctx); + + (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { if (fix_problem(ctx, problem, pctx)) { - if (rec_len < 12) + if (rec_len < 12 && dir_data_error) dirent->rec_len = 12; /* * Note: we don't have the parent inode just @@ -487,7 +558,14 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, { int filetype = dirent->name_len >> 8; int should_be = EXT2_FT_UNKNOWN; + __u16 result; struct ext2_inode inode; + __u8 dirdata = 0; + + if (ctx->fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA) { + dirdata = filetype & ~EXT2_FT_MASK; + filetype = filetype & EXT2_FT_MASK; + } if (!(ctx->fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE)) { @@ -498,16 +576,18 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, return 1; } - if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, dirent->inode)) { + if (ctx->inode_badness) + ext2fs_icount_fetch(ctx->inode_badness, dirent->inode, + &result); + + if (ext2fs_test_inode_bitmap2(ctx->inode_dir_map, dirent->inode)) { should_be = EXT2_FT_DIR; - } else if (ext2fs_test_inode_bitmap(ctx->inode_reg_map, + } else if (ext2fs_test_inode_bitmap2(ctx->inode_reg_map, dirent->inode)) { should_be = EXT2_FT_REG_FILE; - } else if (ctx->inode_bad_map && - ext2fs_test_inode_bitmap(ctx->inode_bad_map, - dirent->inode)) + } else if (ctx->inode_badness && result >= BADNESS_BAD_MODE) { should_be = 0; - else { + } else { e2fsck_read_inode(ctx, dirent->inode, &inode, "check_filetype"); should_be = ext2_file_type(inode.i_mode); @@ -520,13 +600,14 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, pctx) == 0) return 0; - dirent->name_len = (dirent->name_len & 0xFF) | should_be << 8; + dirent->name_len = (dirent->name_len & 0xFF) | + (dirdata | should_be) << 8; 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) @@ -542,7 +623,7 @@ static void parse_int_node(ext2_filsys fs, ext2_dirhash_t hash = 0, prev_hash; if (db->blockcnt == 0) { - root = (struct ext2_dx_root_info *) (block_buf + 24); + root = get_ext2_dx_root_info(fs, block_buf); #ifdef DX_DEBUG printf("Root node dump:\n"); @@ -553,11 +634,12 @@ static void parse_int_node(ext2_filsys fs, printf("\t Flags: %d\n", root->unused_flags); #endif - ent = (struct ext2_dx_entry *) (block_buf + 24 + root->info_length); + ent = (struct ext2_dx_entry *)((char *)root + + root->info_length); } else { - ent = (struct ext2_dx_entry *) (block_buf+8); + ent = (struct ext2_dx_entry *)(block_buf + 8); } - limit = (struct ext2_dx_countlimit *) ent; + limit = (struct ext2_dx_countlimit *)ent; #ifdef DX_DEBUG printf("Number of entries (count): %d\n", @@ -647,11 +729,11 @@ static void salvage_directory(ext2_filsys fs, unsigned int *offset) { char *cp = (char *) dirent; - int left, rec_len; + int left; + unsigned int rec_len, prev_rec_len; unsigned int name_len = dirent->name_len & 0xFF; - rec_len = (dirent->rec_len || fs->blocksize < 65536) ? - dirent->rec_len : 65536; + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); left = fs->blocksize - *offset - rec_len; /* @@ -669,10 +751,11 @@ static void salvage_directory(ext2_filsys fs, * record length. */ if ((left < 0) && - (name_len + 8 <= rec_len + (unsigned) left) && + ((int) rec_len + left > 8) && + ((int) name_len + 8 <= (int) rec_len + left) && dirent->inode <= fs->super->s_inodes_count && strnlen(dirent->name, name_len) == name_len) { - dirent->rec_len += left; + (void) ext2fs_set_rec_len(fs, (int) rec_len + left, dirent); return; } /* @@ -682,7 +765,9 @@ static void salvage_directory(ext2_filsys fs, */ if (prev && rec_len && (rec_len % 4) == 0 && (*offset + rec_len <= fs->blocksize)) { - prev->rec_len += rec_len; + (void) ext2fs_get_rec_len(fs, prev, &prev_rec_len); + prev_rec_len += rec_len; + (void) ext2fs_set_rec_len(fs, prev_rec_len, prev); *offset += rec_len; return; } @@ -693,17 +778,20 @@ static void salvage_directory(ext2_filsys fs, * new empty directory entry the rest of the directory block. */ if (prev) { - prev->rec_len += fs->blocksize - *offset; + (void) ext2fs_get_rec_len(fs, prev, &prev_rec_len); + prev_rec_len += fs->blocksize - *offset; + (void) ext2fs_set_rec_len(fs, prev_rec_len, prev); *offset = fs->blocksize; } else { - dirent->rec_len = fs->blocksize - *offset; + rec_len = fs->blocksize - *offset; + (void) ext2fs_set_rec_len(fs, rec_len, dirent); dirent->name_len = 0; 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; @@ -713,18 +801,17 @@ 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; @@ -736,7 +823,7 @@ static int check_dir_block(ext2_filsys fs, buf = cd->buf; ctx = cd->ctx; - if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) + if (ctx->flags & E2F_FLAG_RUN_RETURN) return DIRENT_ABORT; if (ctx->progress && (ctx->progress)(ctx, 2, cd->count++, cd->max)) @@ -746,7 +833,7 @@ static int check_dir_block(ext2_filsys fs, * Make sure the inode is still in use (could have been * deleted in the duplicate/bad blocks pass. */ - if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, ino))) + if (!(ext2fs_test_inode_bitmap2(ctx->inode_used_map, ino))) return 0; cd->pctx.ino = ino; @@ -776,8 +863,8 @@ 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_block3(fs, block_nr, buf, 0); ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) cd->pctx.errcode = 0; /* We'll handle this ourselves */ @@ -792,6 +879,7 @@ static int check_dir_block(ext2_filsys fs, dx_dir = e2fsck_get_dx_dir_info(ctx, ino); if (dx_dir && dx_dir->numblocks) { if (db->blockcnt >= dx_dir->numblocks) { + pctx.dir = ino; if (fix_problem(ctx, PR_2_UNEXPECTED_HTREE_BLOCK, &pctx)) { clear_htree(ctx, ino); @@ -808,11 +896,10 @@ static int check_dir_block(ext2_filsys fs, dx_db->max_hash = 0; dirent = (struct ext2_dir_entry *) buf; - rec_len = (dirent->rec_len || fs->blocksize < 65536) ? - dirent->rec_len : 65536; + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); limit = (struct ext2_dx_countlimit *) (buf+8); if (db->blockcnt == 0) { - root = (struct ext2_dx_root_info *) (buf + 24); + root = get_ext2_dx_root_info(fs, buf); dx_db->type = DX_DIRBLOCK_ROOT; dx_db->flags |= DX_FLAG_FIRST | DX_FLAG_LAST; if ((root->reserved_zero || @@ -842,13 +929,12 @@ out_htree: dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp); prev = 0; do { - int group; + dgrp_t group; ext2_ino_t first_unused_inode; problem = 0; dirent = (struct ext2_dir_entry *) (buf + offset); - rec_len = (dirent->rec_len || fs->blocksize < 65536) ? - dirent->rec_len : 65536; + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); cd->pctx.dirent = dirent; cd->pctx.num = offset; if (((offset + rec_len) > fs->blocksize) || @@ -862,18 +948,12 @@ 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)) + if (check_dot(ctx, dirent, offset, ino, &cd->pctx)) dir_modified++; } else if (dot_state == 1) { - ret = check_dotdot(ctx, dirent, ino, &cd->pctx); + ret = check_dotdot(ctx, dirent, offset, ino, &cd->pctx); if (ret < 0) goto abort_free_dict; if (ret) @@ -889,6 +969,10 @@ out_htree: if (!dirent->inode) goto next; + ret = e2fsck_check_dirent_data(ctx, dirent, offset, &cd->pctx); + if (ret == 2) + dir_modified++; + /* * Make sure the inode listed is a legal one. */ @@ -897,7 +981,7 @@ out_htree: (dirent->inode > fs->super->s_inodes_count)) { problem = PR_2_BAD_INO; } else if (ctx->inode_bb_map && - (ext2fs_test_inode_bitmap(ctx->inode_bb_map, + (ext2fs_test_inode_bitmap2(ctx->inode_bb_map, dirent->inode))) { /* * If the inode is in a bad block, offer to @@ -958,11 +1042,9 @@ out_htree: * (We wait until now so that we can display the * pathname to the user.) */ - if (ctx->inode_bad_map && - ext2fs_test_inode_bitmap(ctx->inode_bad_map, - dirent->inode)) { - if (e2fsck_process_bad_inode(ctx, ino, - dirent->inode, + if (ctx->inode_badness && + ext2fs_icount_is_set(ctx->inode_badness, dirent->inode)) { + if (e2fsck_process_bad_inode(ctx, ino, dirent->inode, buf + fs->blocksize)) { dirent->inode = 0; dir_modified++; @@ -975,7 +1057,7 @@ out_htree: group = ext2fs_group_of_ino(fs, dirent->inode); first_unused_inode = group * fs->super->s_inodes_per_group + 1 + fs->super->s_inodes_per_group - - fs->group_desc[group].bg_itable_unused; + ext2fs_bg_itable_unused(fs, group); cd->pctx.group = group; /* @@ -986,12 +1068,12 @@ out_htree: * we could call a function in pass1.c that checks the * newly visible inodes. */ - if (fs->group_desc[group].bg_flags & EXT2_BG_INODE_UNINIT) { + if (ext2fs_bg_flags_test(fs, group, EXT2_BG_INODE_UNINIT)) { pctx.num = dirent->inode; if (fix_problem(ctx, PR_2_INOREF_BG_INO_UNINIT, &cd->pctx)){ - fs->group_desc[group].bg_flags &= - ~EXT2_BG_INODE_UNINIT; + ext2fs_bg_flags_clear(fs, group, + EXT2_BG_INODE_UNINIT); ext2fs_mark_super_dirty(fs); ctx->flags |= E2F_FLAG_RESTART_LATER; } else { @@ -1002,7 +1084,7 @@ out_htree: } else if (dirent->inode >= first_unused_inode) { pctx.num = dirent->inode; if (fix_problem(ctx, PR_2_INOREF_IN_UNUSED, &cd->pctx)){ - fs->group_desc[group].bg_itable_unused = 0; + ext2fs_bg_itable_unused_set(fs, group, 0); ext2fs_mark_super_dirty(fs); ctx->flags |= E2F_FLAG_RESTART_LATER; } else { @@ -1012,13 +1094,18 @@ out_htree: } } - if (!(ext2fs_test_inode_bitmap(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)) { @@ -1058,7 +1145,7 @@ out_htree: * and ask the user if he/she wants to clear this one. */ if ((dot_state > 1) && - (ext2fs_test_inode_bitmap(ctx->inode_dir_map, + (ext2fs_test_inode_bitmap2(ctx->inode_dir_map, dirent->inode))) { if (e2fsck_dir_info_get_parent(ctx, dirent->inode, &subdir_parent)) { @@ -1104,8 +1191,7 @@ out_htree: next: prev = dirent; if (dir_modified) - rec_len = (dirent->rec_len || fs->blocksize < 65536) ? - dirent->rec_len : 65536; + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); offset += rec_len; dot_state++; } while (offset < fs->blocksize); @@ -1133,7 +1219,7 @@ out_htree: } } if (dir_modified) { - cd->pctx.errcode = ext2fs_write_dir_block(fs, block_nr, buf); + cd->pctx.errcode = ext2fs_write_dir_block3(fs, block_nr, buf, 0); if (cd->pctx.errcode) { if (!fix_problem(ctx, PR_2_WRITE_DIRBLOCK, &cd->pctx)) @@ -1149,26 +1235,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 >= fs->super->s_blocks_count)) + (*block_nr >= ext2fs_blocks_count(fs->super))) return 0; - ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); - ext2fs_block_alloc_stats(fs, *block_nr, -1); + if ((*block_nr % EXT2FS_CLUSTER_RATIO(fs)) == 0) + ext2fs_block_alloc_stats2(fs, *block_nr, -1); + p->num++; return 0; } @@ -1181,9 +1273,18 @@ 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; + int extent_fs = 0; e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode"); + /* ext2fs_block_iterate2() depends on the extents flags */ + if (inode.i_flags & EXT4_EXTENTS_FL) + extent_fs = 1; e2fsck_clear_inode(ctx, ino, &inode, 0, "deallocate_inode"); + if (extent_fs) { + inode.i_flags |= EXT4_EXTENTS_FL; + e2fsck_write_inode(ctx, ino, &inode, "deallocate_inode"); + } clear_problem_context(&pctx); pctx.ino = ino; @@ -1193,42 +1294,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 (inode.i_file_acl && + if (ext2fs_file_acl_block(fs, &inode) && (fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) { - pctx.errcode = ext2fs_adjust_ea_refcount(fs, inode.i_file_acl, - block_buf, -1, &count); + pctx.errcode = ext2fs_adjust_ea_refcount2(fs, + ext2fs_file_acl_block(fs, &inode), + block_buf, -1, &count); if (pctx.errcode == EXT2_ET_BAD_EA_BLOCK_NUM) { pctx.errcode = 0; count = 1; } if (pctx.errcode) { - pctx.blk = inode.i_file_acl; + 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_bitmap(ctx->block_found_map, - inode.i_file_acl); - ext2fs_block_alloc_stats(fs, inode.i_file_acl, -1); + ext2fs_block_alloc_stats2(fs, + ext2fs_file_acl_block(fs, &inode), -1); } - inode.i_file_acl = 0; + if (ctx->inode_badness) + ext2fs_icount_store(ctx->inode_badness, ino, 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"); } /* @@ -1246,8 +1356,8 @@ static void clear_htree(e2fsck_t ctx, ext2_ino_t ino) } -extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, - ext2_ino_t ino, char *buf) +int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, + ext2_ino_t ino, char *buf) { ext2_filsys fs = ctx->fs; struct ext2_inode inode; @@ -1255,8 +1365,11 @@ 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; + __u16 badness; + if (ctx->inode_badness) + ext2fs_icount_fetch(ctx->inode_badness, ino, &badness); e2fsck_read_inode(ctx, ino, &inode, "process_bad_inode"); clear_problem_context(&pctx); @@ -1264,13 +1377,14 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, pctx.dir = dir; pctx.inode = &inode; - if (inode.i_file_acl && + 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)) { - inode.i_file_acl = 0; + ext2fs_file_acl_block_set(fs, &inode, 0); inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; } if (!LINUX_S_ISDIR(inode.i_mode) && !LINUX_S_ISREG(inode.i_mode) && @@ -1290,8 +1404,8 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, else if (LINUX_S_ISSOCK(inode.i_mode) && !e2fsck_pass1_check_device_inode(fs, &inode)) problem = PR_2_BAD_SOCKET; - else if (LINUX_S_ISLNK(inode.i_mode) - && !e2fsck_pass1_check_symlink(fs, ino, &inode, buf)) { + else if (LINUX_S_ISLNK(inode.i_mode) && + !e2fsck_pass1_check_symlink(ctx, ino, &inode, buf)) { problem = PR_2_INVALID_SYMLINK; } @@ -1304,6 +1418,11 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, } else not_fixed++; problem = 0; + /* + * A high value is associated with bad mode in order to detect + * that mode was corrupt in check_filetype() + */ + badness += BADNESS_BAD_MODE; } if (inode.i_faddr) { @@ -1312,6 +1431,7 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; } switch (fs->super->s_creator_os) { @@ -1329,6 +1449,7 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; pctx.num = 0; } if (fsize && *fsize) { @@ -1338,9 +1459,26 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; pctx.num = 0; } + /* In pass1 these conditions were used to mark inode bad so that + * it calls e2fsck_process_bad_inode and make an extensive check + * plus prompt for action to be taken. To compensate for badness + * incremented in pass1 by this condition, decrease it. + */ + if ((inode.i_faddr || frag || fsize || + (LINUX_S_ISDIR(inode.i_mode) && inode.i_dir_acl)) || + (inode.i_file_acl && + (!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) || + (inode.i_file_acl < fs->super->s_first_data_block) || + (inode.i_file_acl >= fs->super->s_blocks_count)))) { + /* badness can be 0 if called from pass4. */ + if (badness) + badness -= BADNESS_NORMAL; + } + if ((fs->super->s_creator_os == EXT2_OS_LINUX) && !(fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) && @@ -1350,9 +1488,12 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode.osd2.linux2.l_i_blocks_hi = 0; inode_modified++; } + /* Badness was increased in pass1 for this condition */ + /* badness += BADNESS_NORMAL; */ } - if (!(fs->super->s_feature_incompat & + if ((fs->super->s_creator_os == EXT2_OS_LINUX) && + !(fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && inode.osd2.linux2.l_i_file_acl_high != 0) { pctx.num = inode.osd2.linux2.l_i_file_acl_high; @@ -1361,16 +1502,18 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; } - if (inode.i_file_acl && - ((inode.i_file_acl < fs->super->s_first_data_block) || - (inode.i_file_acl >= fs->super->s_blocks_count))) { + 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)) { - inode.i_file_acl = 0; + ext2fs_file_acl_block_set(fs, &inode, 0); inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; } if (inode.i_dir_acl && LINUX_S_ISDIR(inode.i_mode)) { @@ -1379,12 +1522,29 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, inode_modified++; } else not_fixed++; + badness += BADNESS_NORMAL; + } + + /* + * The high value due to BADNESS_BAD_MODE should not delete the inode. + */ + if (ctx->inode_badness && (badness - (badness >= BADNESS_BAD_MODE ? + BADNESS_BAD_MODE : 0)) >= + ctx->inode_badness_threshold) { + pctx.num = badness; + if (fix_problem(ctx, PR_2_INODE_TOOBAD, &pctx)) { + deallocate_inode(ctx, ino, 0); + if (ctx->flags & E2F_FLAG_SIGNAL_MASK) + return 0; + return 1; + } + not_fixed++; } if (inode_modified) e2fsck_write_inode(ctx, ino, &inode, "process_bad_inode"); - if (!not_fixed && ctx->inode_bad_map) - ext2fs_unmark_inode_bitmap(ctx->inode_bad_map, ino); + if (ctx->inode_badness) + ext2fs_icount_store(ctx->inode_badness, ino, 0); return 0; } @@ -1396,12 +1556,12 @@ 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) { ext2_filsys fs = ctx->fs; - blk_t blk; + blk64_t blk = 0; char *block; struct ext2_inode inode; @@ -1417,14 +1577,20 @@ static int allocate_dir_block(e2fsck_t ctx, /* * First, find a free block */ - pctx->errcode = ext2fs_new_block(fs, 0, ctx->block_found_map, &blk); - if (pctx->errcode) { - pctx->str = "ext2fs_new_block"; - fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx); - return 1; + e2fsck_read_inode(ctx, db->ino, &inode, "allocate_dir_block"); + pctx->errcode = ext2fs_map_cluster_block(fs, db->ino, &inode, + db->blockcnt, &blk); + if (pctx->errcode || blk == 0) { + pctx->errcode = ext2fs_new_block2(fs, 0, + ctx->block_found_map, &blk); + if (pctx->errcode) { + pctx->str = "ext2fs_new_block"; + fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx); + return 1; + } } - ext2fs_mark_block_bitmap(ctx->block_found_map, blk); - ext2fs_mark_block_bitmap(fs->block_map, blk); + ext2fs_mark_block_bitmap2(ctx->block_found_map, blk); + ext2fs_mark_block_bitmap2(fs->block_map, blk); ext2fs_mark_bb_dirty(fs); /* @@ -1442,7 +1608,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_block3(fs, blk, block, 0); ext2fs_free_mem(&block); if (pctx->errcode) { pctx->str = "ext2fs_write_dir_block"; @@ -1453,18 +1619,24 @@ static int allocate_dir_block(e2fsck_t ctx, /* * Update the inode block count */ - e2fsck_read_inode(ctx, db->ino, &inode, "allocate_dir_block"); ext2fs_iblk_add_blocks(fs, &inode, 1); - if (inode.i_size < (db->blockcnt+1) * fs->blocksize) - inode.i_size = (db->blockcnt+1) * fs->blocksize; + if (EXT2_I_SIZE(&inode) < (db->blockcnt+1) * fs->blocksize) { + pctx->errcode = ext2fs_inode_size_set(fs, &inode, + (db->blockcnt+1) * fs->blocksize); + if (pctx->errcode) { + pctx->str = "ext2fs_inode_size_set"; + fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx); + return 1; + } + } e2fsck_write_inode(ctx, db->ino, &inode, "allocate_dir_block"); /* * 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); @@ -1473,23 +1645,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; -}