X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fpass2.c;h=1300e3874da01580da281b9d0946b8b873782b51;hb=97d26ce9e3589e9f5fa17014467a9730a884d158;hp=e424eb50fd5288a07c7975ae0ba879bba0b2ac71;hpb=a47426914745b7d50bb58a3d44b3509c647c637e;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index e424eb5..1300e38 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -1,13 +1,13 @@ /* * pass2.c --- check directory structure - * + * * Copyright (C) 1993, 1994, 1995, 1996, 1997 Theodore Ts'o * * %Begin-Header% * This file may be redistributed under the terms of the GNU Public * License. * %End-Header% - * + * * Pass 2 of e2fsck iterates through all active directory inodes, and * applies to following tests to each directory entry in the directory * blocks in the inodes: @@ -16,7 +16,7 @@ * least 8 bytes, and no more than the remaining space * left in the directory block. * - The length of the name in the directory entry (name_len) - * should be less than (rec_len - 8). + * should be less than (rec_len - 8). * - The inode number in the directory entry should be within * legal bounds. * - The inode number should refer to a in-use inode. @@ -41,8 +41,12 @@ * - The inode_reg_map bitmap */ +#define _GNU_SOURCE 1 /* get strnlen() */ +#include + #include "e2fsck.h" #include "problem.h" +#include "dict.h" #ifdef NO_INLINE_FUNCS #define _INLINE_ @@ -50,6 +54,8 @@ #define _INLINE_ inline #endif +/* #define DX_DEBUG */ + /* * Keeps track of how many times an inode is referenced. */ @@ -60,19 +66,17 @@ static int check_dir_block(ext2_filsys fs, static int allocate_dir_block(e2fsck_t ctx, struct ext2_db_entry *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); +static EXT2_QSORT_TYPE special_dir_block_cmp(const void *a, const void *b); struct check_dir_struct { char *buf; struct problem_context pctx; int count, max; e2fsck_t ctx; -}; +}; void e2fsck_pass2(e2fsck_t ctx) { @@ -83,13 +87,15 @@ void e2fsck_pass2(e2fsck_t ctx) #ifdef RESOURCE_TRACK struct resource_track rtrack; #endif - struct dir_info *dir; struct check_dir_struct cd; - -#ifdef RESOURCE_TRACK - init_resource_track(&rtrack); -#endif + struct dx_dir_info *dx_dir; + struct dx_dirblock_info *dx_db, *dx_parent; + int b; + int i, depth; + problem_t code; + int bad_dir; + init_resource_track(&rtrack, ctx->fs->io); clear_problem_context(&cd.pctx); #ifdef MTRACE @@ -99,7 +105,13 @@ void e2fsck_pass2(e2fsck_t ctx) if (!(ctx->options & E2F_OPT_PREEN)) fix_problem(ctx, PR_2_PASS_HEADER, &cd.pctx); - cd.pctx.errcode = ext2fs_create_icount2(fs, EXT2_ICOUNT_OPT_INCREMENT, + e2fsck_setup_tdb_icount(ctx, EXT2_ICOUNT_OPT_INCREMENT, + &ctx->inode_count); + if (ctx->inode_count) + cd.pctx.errcode = 0; + else + cd.pctx.errcode = ext2fs_create_icount2(fs, + EXT2_ICOUNT_OPT_INCREMENT, 0, ctx->inode_link_info, &ctx->inode_count); if (cd.pctx.errcode) { @@ -107,7 +119,7 @@ void e2fsck_pass2(e2fsck_t ctx) ctx->flags |= E2F_FLAG_ABORT; return; } - buf = (char *) e2fsck_allocate_memory(ctx, fs->blocksize, + buf = (char *) e2fsck_allocate_memory(ctx, 2*fs->blocksize, "directory scan buffer"); /* @@ -115,9 +127,7 @@ void e2fsck_pass2(e2fsck_t ctx) * present. (If the root directory is not present, we will * create it in pass 3.) */ - dir = e2fsck_get_dir_info(ctx, EXT2_ROOT_INO); - if (dir) - dir->parent = EXT2_ROOT_INO; + (void) e2fsck_dir_info_set_parent(ctx, EXT2_ROOT_INO, EXT2_ROOT_INO); cd.buf = buf; cd.ctx = ctx; @@ -126,18 +136,116 @@ void e2fsck_pass2(e2fsck_t ctx) 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) + if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) + return; + + if (ctx->flags & E2F_FLAG_RESTART_LATER) { + ctx->flags |= E2F_FLAG_RESTART; return; + } + if (cd.pctx.errcode) { fix_problem(ctx, PR_2_DBLIST_ITERATE, &cd.pctx); ctx->flags |= E2F_FLAG_ABORT; return; } - - ext2fs_free_mem((void **) &buf); + +#ifdef ENABLE_HTREE + for (i=0; (dx_dir = e2fsck_dx_dir_info_iter(ctx, &i)) != 0;) { + if (ctx->flags & E2F_FLAG_SIGNAL_MASK) + return; + if (dx_dir->numblocks == 0) + continue; + clear_problem_context(&pctx); + bad_dir = 0; + pctx.dir = dx_dir->ino; + dx_db = dx_dir->dx_block; + if (dx_db->flags & DX_FLAG_REFERENCED) + dx_db->flags |= DX_FLAG_DUP_REF; + else + dx_db->flags |= DX_FLAG_REFERENCED; + /* + * Find all of the first and last leaf blocks, and + * update their parent's min and max hash values + */ + for (b=0, dx_db = dx_dir->dx_block; + b < dx_dir->numblocks; + b++, dx_db++) { + if ((dx_db->type != DX_DIRBLOCK_LEAF) || + !(dx_db->flags & (DX_FLAG_FIRST | DX_FLAG_LAST))) + continue; + dx_parent = &dx_dir->dx_block[dx_db->parent]; + /* + * XXX Make sure dx_parent->min_hash > dx_db->min_hash + */ + if (dx_db->flags & DX_FLAG_FIRST) + dx_parent->min_hash = dx_db->min_hash; + /* + * XXX Make sure dx_parent->max_hash < dx_db->max_hash + */ + if (dx_db->flags & DX_FLAG_LAST) + dx_parent->max_hash = dx_db->max_hash; + } + + for (b=0, dx_db = dx_dir->dx_block; + b < dx_dir->numblocks; + b++, dx_db++) { + pctx.blkcount = b; + pctx.group = dx_db->parent; + code = 0; + if (!(dx_db->flags & DX_FLAG_FIRST) && + (dx_db->min_hash < dx_db->node_min_hash)) { + pctx.blk = dx_db->min_hash; + pctx.blk2 = dx_db->node_min_hash; + code = PR_2_HTREE_MIN_HASH; + fix_problem(ctx, code, &pctx); + bad_dir++; + } + if (dx_db->type == DX_DIRBLOCK_LEAF) { + depth = htree_depth(dx_dir, dx_db); + if (depth != dx_dir->depth) { + pctx.num = dx_dir->depth; + code = PR_2_HTREE_BAD_DEPTH; + fix_problem(ctx, code, &pctx); + bad_dir++; + } + } + /* + * This test doesn't apply for the root block + * at block #0 + */ + if (b && + (dx_db->max_hash > dx_db->node_max_hash)) { + pctx.blk = dx_db->max_hash; + pctx.blk2 = dx_db->node_max_hash; + code = PR_2_HTREE_MAX_HASH; + fix_problem(ctx, code, &pctx); + bad_dir++; + } + if (!(dx_db->flags & DX_FLAG_REFERENCED)) { + code = PR_2_HTREE_NOTREF; + fix_problem(ctx, code, &pctx); + bad_dir++; + } else if (dx_db->flags & DX_FLAG_DUP_REF) { + code = PR_2_HTREE_DUPREF; + fix_problem(ctx, code, &pctx); + bad_dir++; + } + } + if (bad_dir && fix_problem(ctx, PR_2_HTREE_CLEAR, &pctx)) { + clear_htree(ctx, dx_dir->ino); + dx_dir->numblocks = 0; + } + } + e2fsck_free_dx_dir_info(ctx); +#endif + ext2fs_free_mem(&buf); ext2fs_free_dblist(fs->dblist); if (ctx->inode_bad_map) { @@ -156,6 +264,7 @@ void e2fsck_pass2(e2fsck_t ctx) fix_problem(ctx, PR_2_FEATURE_LARGE_FILES, &pctx)) { sb->s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_LARGE_FILE; + fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY; ext2fs_mark_super_dirty(fs); } if (sb->s_rev_level == EXT2_GOOD_OLD_REV && @@ -163,24 +272,69 @@ void e2fsck_pass2(e2fsck_t ctx) ext2fs_update_dynamic_rev(fs); ext2fs_mark_super_dirty(fs); } - } else if (!ctx->large_files && - (sb->s_feature_ro_compat & - EXT2_FEATURE_RO_COMPAT_LARGE_FILE)) { - if (fs->flags & EXT2_FLAG_RW) { - sb->s_feature_ro_compat &= - ~EXT2_FEATURE_RO_COMPAT_LARGE_FILE; - ext2fs_mark_super_dirty(fs); - } } - -#ifdef RESOURCE_TRACK - if (ctx->options & E2F_OPT_TIME2) { - e2fsck_clear_progbar(ctx); - print_resource_track("Pass 2", &rtrack); + + print_resource_track(ctx, _("Pass 2"), &rtrack, fs->io); +} + +#define MAX_DEPTH 32000 +static int htree_depth(struct dx_dir_info *dx_dir, + struct dx_dirblock_info *dx_db) +{ + int depth = 0; + + while (dx_db->type != DX_DIRBLOCK_ROOT && depth < MAX_DEPTH) { + dx_db = &dx_dir->dx_block[dx_db->parent]; + depth++; } -#endif + return depth; +} + +static int dict_de_cmp(const void *a, const void *b) +{ + const struct ext2_dir_entry *de_a, *de_b; + int a_len, b_len; + + de_a = (const struct ext2_dir_entry *) a; + a_len = de_a->name_len & 0xFF; + de_b = (const struct ext2_dir_entry *) b; + b_len = de_b->name_len & 0xFF; + + if (a_len != b_len) + return (a_len - b_len); + + return strncmp(de_a->name, de_b->name, a_len); +} + +/* + * This is special sort function that makes sure that directory blocks + * with a dirblock of zero are sorted to the beginning of the list. + * This guarantees that the root node of the htree directories are + * processed first, so we know what hash version to use. + */ +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; + + if (db_a->blockcnt && !db_b->blockcnt) + return 1; + + if (!db_a->blockcnt && db_b->blockcnt) + return -1; + + if (db_a->blk != db_b->blk) + return (int) (db_a->blk - db_b->blk); + + if (db_a->ino != db_b->ino) + return (int) (db_a->ino - db_b->ino); + + return (int) (db_a->blockcnt - db_b->blockcnt); } + /* * Make sure the first entry in the directory is '.', and that the * directory entry is sane. @@ -190,11 +344,11 @@ static int check_dot(e2fsck_t ctx, ext2_ino_t ino, struct problem_context *pctx) { struct ext2_dir_entry *nextdir; + unsigned int rec_len, new_len; int status = 0; int created = 0; - int new_len; int problem = 0; - + if (!dirent->inode) problem = PR_2_MISSING_DOT; else if (((dirent->name_len & 0xFF) != 1) || @@ -202,11 +356,12 @@ static int check_dot(e2fsck_t ctx, problem = PR_2_1ST_NOT_DOT; else if (dirent->name[1] != '\0') problem = PR_2_DOT_NULL_TERM; - + + (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { if (fix_problem(ctx, problem, pctx)) { - if (dirent->rec_len < 12) - dirent->rec_len = 12; + if (rec_len < 12) + rec_len = dirent->rec_len = 12; dirent->inode = ino; dirent->name_len = 1; dirent->name[0] = '.'; @@ -221,15 +376,16 @@ static int check_dot(e2fsck_t ctx, status = 1; } } - if (dirent->rec_len > 12) { - new_len = dirent->rec_len - 12; + if (rec_len > 12) { + new_len = rec_len - 12; if (new_len > 12) { if (created || fix_problem(ctx, PR_2_SPLIT_DOT, pctx)) { 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; @@ -246,10 +402,10 @@ static int check_dot(e2fsck_t ctx, */ static int check_dotdot(e2fsck_t ctx, struct ext2_dir_entry *dirent, - struct dir_info *dir, struct problem_context *pctx) + ext2_ino_t ino, struct problem_context *pctx) { - int problem = 0; - + int rec_len, problem = 0; + if (!dirent->inode) problem = PR_2_MISSING_DOT_DOT; else if (((dirent->name_len & 0xFF) != 2) || @@ -259,9 +415,10 @@ static int check_dotdot(e2fsck_t ctx, else if (dirent->name[2] != '\0') problem = PR_2_DOT_DOT_NULL_TERM; + (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { if (fix_problem(ctx, problem, pctx)) { - if (dirent->rec_len < 12) + if (rec_len < 12) dirent->rec_len = 12; /* * Note: we don't have the parent inode just @@ -274,10 +431,13 @@ static int check_dotdot(e2fsck_t ctx, dirent->name[1] = '.'; dirent->name[2] = '\0'; return 1; - } + } return 0; } - dir->dotdot = dirent->inode; + if (e2fsck_dir_info_set_dotdot(ctx, ino, dirent->inode)) { + fix_problem(ctx, PR_2_NO_DIRINFO, pctx); + return -1; + } return 0; } @@ -287,12 +447,13 @@ static int check_dotdot(e2fsck_t ctx, */ static int check_name(e2fsck_t ctx, struct ext2_dir_entry *dirent, - ext2_ino_t dir_ino, struct problem_context *pctx) + ext2_ino_t dir_ino EXT2FS_ATTR((unused)), + struct problem_context *pctx) { int i; int fixup = -1; int ret = 0; - + for ( i = 0; i < (dirent->name_len & 0xFF); i++) { if (dirent->name[i] == '/' || dirent->name[i] == '\0') { if (fixup < 0) { @@ -311,8 +472,9 @@ static int check_name(e2fsck_t ctx, * Check the directory filetype (if present) */ static _INLINE_ int check_filetype(e2fsck_t ctx, - struct ext2_dir_entry *dirent, - ext2_ino_t dir_ino, struct problem_context *pctx) + struct ext2_dir_entry *dirent, + ext2_ino_t dir_ino EXT2FS_ATTR((unused)), + struct problem_context *pctx) { int filetype = dirent->name_len >> 8; int should_be = EXT2_FT_UNKNOWN; @@ -327,13 +489,13 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, return 1; } - if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, dirent->inode)) { + 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, + ext2fs_test_inode_bitmap2(ctx->inode_bad_map, dirent->inode)) should_be = 0; else { @@ -348,42 +510,240 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, if (fix_problem(ctx, filetype ? PR_2_BAD_FILETYPE : PR_2_SET_FILETYPE, pctx) == 0) return 0; - + dirent->name_len = (dirent->name_len & 0xFF) | should_be << 8; return 1; } +#ifdef ENABLE_HTREE +static void parse_int_node(ext2_filsys fs, + struct ext2_db_entry *db, + struct check_dir_struct *cd, + struct dx_dir_info *dx_dir, + char *block_buf) +{ + struct ext2_dx_root_info *root; + struct ext2_dx_entry *ent; + struct ext2_dx_countlimit *limit; + struct dx_dirblock_info *dx_db; + int i, expect_limit, count; + blk_t blk; + ext2_dirhash_t min_hash = 0xffffffff; + ext2_dirhash_t max_hash = 0; + ext2_dirhash_t hash = 0, prev_hash; + + if (db->blockcnt == 0) { + root = (struct ext2_dx_root_info *) (block_buf + 24); + +#ifdef DX_DEBUG + printf("Root node dump:\n"); + printf("\t Reserved zero: %u\n", root->reserved_zero); + printf("\t Hash Version: %d\n", root->hash_version); + printf("\t Info length: %d\n", root->info_length); + printf("\t Indirect levels: %d\n", root->indirect_levels); + printf("\t Flags: %d\n", root->unused_flags); +#endif + + ent = (struct ext2_dx_entry *) (block_buf + 24 + root->info_length); + } else { + ent = (struct ext2_dx_entry *) (block_buf+8); + } + limit = (struct ext2_dx_countlimit *) ent; + +#ifdef DX_DEBUG + printf("Number of entries (count): %d\n", + ext2fs_le16_to_cpu(limit->count)); + printf("Number of entries (limit): %d\n", + ext2fs_le16_to_cpu(limit->limit)); +#endif + + count = ext2fs_le16_to_cpu(limit->count); + expect_limit = (fs->blocksize - ((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)) + goto clear_and_exit; + } + if (count > expect_limit) { + cd->pctx.num = count; + if (fix_problem(cd->ctx, PR_2_HTREE_BAD_COUNT, &cd->pctx)) + goto clear_and_exit; + count = expect_limit; + } + + for (i=0; i < count; i++) { + prev_hash = hash; + hash = i ? (ext2fs_le32_to_cpu(ent[i].hash) & ~1) : 0; +#ifdef DX_DEBUG + printf("Entry #%d: Hash 0x%08x, block %u\n", i, + hash, ext2fs_le32_to_cpu(ent[i].block)); +#endif + blk = ext2fs_le32_to_cpu(ent[i].block) & 0x0ffffff; + /* Check to make sure the block is valid */ + if (blk >= (blk_t) dx_dir->numblocks) { + cd->pctx.blk = blk; + if (fix_problem(cd->ctx, PR_2_HTREE_BADBLK, + &cd->pctx)) + goto clear_and_exit; + continue; + } + if (hash < prev_hash && + fix_problem(cd->ctx, PR_2_HTREE_HASH_ORDER, &cd->pctx)) + goto clear_and_exit; + dx_db = &dx_dir->dx_block[blk]; + if (dx_db->flags & DX_FLAG_REFERENCED) { + dx_db->flags |= DX_FLAG_DUP_REF; + } else { + dx_db->flags |= DX_FLAG_REFERENCED; + dx_db->parent = db->blockcnt; + } + if (hash < min_hash) + min_hash = hash; + if (hash > max_hash) + max_hash = hash; + dx_db->node_min_hash = hash; + if ((i+1) < count) + dx_db->node_max_hash = + ext2fs_le32_to_cpu(ent[i+1].hash) & ~1; + else { + dx_db->node_max_hash = 0xfffffffe; + dx_db->flags |= DX_FLAG_LAST; + } + if (i == 0) + dx_db->flags |= DX_FLAG_FIRST; + } +#ifdef DX_DEBUG + printf("Blockcnt = %d, min hash 0x%08x, max hash 0x%08x\n", + db->blockcnt, min_hash, max_hash); +#endif + dx_db = &dx_dir->dx_block[db->blockcnt]; + dx_db->min_hash = min_hash; + dx_db->max_hash = max_hash; + return; + +clear_and_exit: + clear_htree(cd->ctx, cd->pctx.ino); + dx_dir->numblocks = 0; +} +#endif /* ENABLE_HTREE */ + +/* + * Given a busted directory, try to salvage it somehow. + * + */ +static void salvage_directory(ext2_filsys fs, + struct ext2_dir_entry *dirent, + struct ext2_dir_entry *prev, + unsigned int *offset) +{ + char *cp = (char *) dirent; + int left; + unsigned int rec_len, prev_rec_len; + unsigned int name_len = dirent->name_len & 0xFF; + + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); + left = fs->blocksize - *offset - rec_len; + + /* + * Special case of directory entry of size 8: copy what's left + * of the directory block up to cover up the invalid hole. + */ + if ((left >= 12) && (rec_len == 8)) { + memmove(cp, cp+8, left); + memset(cp + left, 0, 8); + return; + } + /* + * If the directory entry overruns the end of the directory + * block, and the name is small enough to fit, then adjust the + * record length. + */ + if ((left < 0) && + ((int) rec_len + left > 8) && + (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); + return; + } + /* + * If the record length of the directory entry is a multiple + * of four, and not too big, such that it is valid, let the + * previous directory entry absorb the invalid one. + */ + if (prev && rec_len && (rec_len % 4) == 0 && + (*offset + rec_len <= fs->blocksize)) { + (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; + } + /* + * Default salvage method --- kill all of the directory + * entries for the rest of the block. We will either try to + * absorb it into the previous directory entry, or create a + * new empty directory entry the rest of the directory block. + */ + if (prev) { + (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 { + 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, void *priv_data) { - struct dir_info *subdir, *dir; - struct ext2_dir_entry *dirent; - int offset = 0; + struct dx_dir_info *dx_dir; +#ifdef ENABLE_HTREE + struct dx_dirblock_info *dx_db = 0; +#endif /* ENABLE_HTREE */ + 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; 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; + 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; cd = (struct check_dir_struct *) priv_data; buf = cd->buf; ctx = cd->ctx; - if (ctx->progress) - if ((ctx->progress)(ctx, 2, cd->count++, cd->max)) - return DIRENT_ABORT; - + if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) + return DIRENT_ABORT; + + if (ctx->progress && (ctx->progress)(ctx, 2, cd->count++, cd->max)) + return DIRENT_ABORT; + /* - * Make sure the inode is still in use (could have been + * 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; @@ -398,18 +758,24 @@ static int check_dir_block(ext2_filsys fs, return 0; block_nr = db->blk; } - + if (db->blockcnt) dot_state = 2; else dot_state = 0; + if (ctx->dirs_to_hash && + ext2fs_u32_list_test(ctx->dirs_to_hash, ino)) + dups_found++; + #if 0 printf("In process_dir_block block %lu, #%d, inode %lu\n", block_nr, db->blockcnt, ino); #endif - + + old_op = ehandler_operation(_("reading directory block")); cd->pctx.errcode = ext2fs_read_dir_block(fs, block_nr, buf); + ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) cd->pctx.errcode = 0; /* We'll handle this ourselves */ if (cd->pctx.errcode) { @@ -419,24 +785,77 @@ static int check_dir_block(ext2_filsys fs, } memset(buf, 0, fs->blocksize); } +#ifdef ENABLE_HTREE + dx_dir = e2fsck_get_dx_dir_info(ctx, ino); + if (dx_dir && dx_dir->numblocks) { + if (db->blockcnt >= dx_dir->numblocks) { + if (fix_problem(ctx, PR_2_UNEXPECTED_HTREE_BLOCK, + &pctx)) { + clear_htree(ctx, ino); + dx_dir->numblocks = 0; + dx_db = 0; + goto out_htree; + } + fatal_error(ctx, _("Can not continue.")); + } + dx_db = &dx_dir->dx_block[db->blockcnt]; + dx_db->type = DX_DIRBLOCK_LEAF; + dx_db->phys = block_nr; + dx_db->min_hash = ~0; + dx_db->max_hash = 0; + dirent = (struct ext2_dir_entry *) buf; + (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); + dx_db->type = DX_DIRBLOCK_ROOT; + dx_db->flags |= DX_FLAG_FIRST | DX_FLAG_LAST; + if ((root->reserved_zero || + root->info_length < 8 || + root->indirect_levels > 1) && + fix_problem(ctx, PR_2_HTREE_BAD_ROOT, &cd->pctx)) { + clear_htree(ctx, ino); + dx_dir->numblocks = 0; + dx_db = 0; + } + dx_dir->hashversion = root->hash_version; + if ((dx_dir->hashversion <= EXT2_HASH_TEA) && + (fs->super->s_flags & EXT2_FLAGS_UNSIGNED_HASH)) + dx_dir->hashversion += 3; + dx_dir->depth = root->indirect_levels + 1; + } else if ((dirent->inode == 0) && + (rec_len == fs->blocksize) && + (dirent->name_len == 0) && + (ext2fs_le16_to_cpu(limit->limit) == + ((fs->blocksize-8) / + sizeof(struct ext2_dx_entry)))) + dx_db->type = DX_DIRBLOCK_NODE; + } +out_htree: +#endif /* ENABLE_HTREE */ + + dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp); + prev = 0; do { - dot_state++; + int group; + ext2_ino_t first_unused_inode; + problem = 0; dirent = (struct ext2_dir_entry *) (buf + offset); + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); cd->pctx.dirent = dirent; cd->pctx.num = offset; - if (((offset + dirent->rec_len) > fs->blocksize) || - (dirent->rec_len < 12) || - ((dirent->rec_len % 4) != 0) || - (((dirent->name_len & 0xFF)+8) > dirent->rec_len)) { + if (((offset + rec_len) > fs->blocksize) || + (rec_len < 12) || + ((rec_len % 4) != 0) || + (((dirent->name_len & (unsigned) 0xFF)+8) > rec_len)) { if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) { - dirent->rec_len = fs->blocksize - offset; - dirent->name_len = 0; - dirent->inode = 0; + salvage_directory(fs, dirent, prev, &offset); dir_modified++; + continue; } else - return DIRENT_ABORT; + goto abort_free_dict; } if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) { if (fix_problem(ctx, PR_2_FILENAME_LONG, &cd->pctx)) { @@ -445,17 +864,14 @@ static int check_dir_block(ext2_filsys fs, } } - if (dot_state == 1) { + if (dot_state == 0) { if (check_dot(ctx, dirent, ino, &cd->pctx)) dir_modified++; - } else if (dot_state == 2) { - dir = e2fsck_get_dir_info(ctx, ino); - if (!dir) { - fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx); - ctx->flags |= E2F_FLAG_ABORT; - return DIRENT_ABORT; - } - if (check_dotdot(ctx, dirent, dir, &cd->pctx)) + } else if (dot_state == 1) { + ret = check_dotdot(ctx, dirent, ino, &cd->pctx); + if (ret < 0) + goto abort_free_dict; + if (ret) dir_modified++; } else if (dirent->inode == ino) { problem = PR_2_LINK_DOT; @@ -465,31 +881,25 @@ static int check_dir_block(ext2_filsys fs, goto next; } } - if (!dirent->inode) + if (!dirent->inode) goto next; - + /* * Make sure the inode listed is a legal one. - */ + */ if (((dirent->inode != EXT2_ROOT_INO) && (dirent->inode < EXT2_FIRST_INODE(fs->super))) || (dirent->inode > fs->super->s_inodes_count)) { problem = PR_2_BAD_INO; - } else if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, - dirent->inode))) { - /* - * If the inode is unused, offer to clear it. - */ - problem = PR_2_UNUSED_INODE; } 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 * clear it. */ problem = PR_2_BB_INODE; - } else if ((dot_state > 2) && + } else if ((dot_state > 1) && ((dirent->name_len & 0xFF) == 1) && (dirent->name[0] == '.')) { /* @@ -498,9 +908,9 @@ static int check_dir_block(ext2_filsys fs, * duplicate entry that should be removed. */ problem = PR_2_DUP_DOT; - } else if ((dot_state > 2) && + } else if ((dot_state > 1) && ((dirent->name_len & 0xFF) == 2) && - (dirent->name[0] == '.') && + (dirent->name[0] == '.') && (dirent->name[1] == '.')) { /* * If there's a '..' entry in anything other @@ -508,7 +918,7 @@ static int check_dir_block(ext2_filsys fs, * duplicate entry that should be removed. */ problem = PR_2_DUP_DOT_DOT; - } else if ((dot_state > 2) && + } else if ((dot_state > 1) && (dirent->inode == EXT2_ROOT_INO)) { /* * Don't allow links to the root directory. @@ -517,7 +927,7 @@ static int check_dir_block(ext2_filsys fs, * directory hasn't been created yet. */ problem = PR_2_LINK_ROOT; - } else if ((dot_state > 2) && + } else if ((dot_state > 1) && (dirent->name_len & 0xFF) == 0) { /* * Don't allow zero-length directory names. @@ -544,10 +954,11 @@ static int check_dir_block(ext2_filsys fs, * pathname to the user.) */ if (ctx->inode_bad_map && - ext2fs_test_inode_bitmap(ctx->inode_bad_map, + ext2fs_test_inode_bitmap2(ctx->inode_bad_map, dirent->inode)) { if (e2fsck_process_bad_inode(ctx, ino, - dirent->inode)) { + dirent->inode, + buf + fs->blocksize)) { dirent->inode = 0; dir_modified++; goto next; @@ -556,12 +967,89 @@ static int check_dir_block(ext2_filsys fs, return DIRENT_ABORT; } + 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 - + ext2fs_bg_itable_unused(fs, group); + cd->pctx.group = group; + + /* + * Check if the inode was missed out because + * _INODE_UNINIT flag was set or bg_itable_unused was + * incorrect. If so, clear the _INODE_UNINIT flag and + * restart e2fsck. In the future it would be nice if + * we could call a function in pass1.c that checks the + * newly visible inodes. + */ + 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)){ + ext2fs_bg_flags_clear(fs, group, + EXT2_BG_INODE_UNINIT); + ext2fs_mark_super_dirty(fs); + ctx->flags |= E2F_FLAG_RESTART_LATER; + } else { + ext2fs_unmark_valid(fs); + if (problem == PR_2_BAD_INO) + goto next; + } + } else if (dirent->inode >= first_unused_inode) { + pctx.num = dirent->inode; + if (fix_problem(ctx, PR_2_INOREF_IN_UNUSED, &cd->pctx)){ + ext2fs_bg_itable_unused_set(fs, group, 0); + ext2fs_mark_super_dirty(fs); + ctx->flags |= E2F_FLAG_RESTART_LATER; + } else { + ext2fs_unmark_valid(fs); + if (problem == PR_2_BAD_INO) + goto next; + } + } + + /* + * 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)) { + dirent->inode = 0; + dir_modified++; + goto next; + } else { + ext2fs_unmark_valid(fs); + if (problem == PR_2_BAD_INO) + goto next; + } + } + if (check_name(ctx, dirent, ino, &cd->pctx)) dir_modified++; if (check_filetype(ctx, dirent, ino, &cd->pctx)) dir_modified++; +#ifdef ENABLE_HTREE + if (dx_db) { + ext2fs_dirhash(dx_dir->hashversion, dirent->name, + (dirent->name_len & 0xFF), + fs->super->s_hash_seed, &hash, 0); + if (hash < dx_db->min_hash) + dx_db->min_hash = hash; + if (hash > dx_db->max_hash) + dx_db->max_hash = hash; + } +#endif + /* * If this is a directory, then mark its parent in its * dir_info structure. If the parent field is already @@ -569,18 +1057,17 @@ static int check_dir_block(ext2_filsys fs, * hard link. We assume the first link is correct, * and ask the user if he/she wants to clear this one. */ - if ((dot_state > 2) && - (ext2fs_test_inode_bitmap(ctx->inode_dir_map, + if ((dot_state > 1) && + (ext2fs_test_inode_bitmap2(ctx->inode_dir_map, dirent->inode))) { - subdir = e2fsck_get_dir_info(ctx, dirent->inode); - if (!subdir) { + if (e2fsck_dir_info_get_parent(ctx, dirent->inode, + &subdir_parent)) { cd->pctx.ino = dirent->inode; fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx); - ctx->flags |= E2F_FLAG_ABORT; - return DIRENT_ABORT; + goto abort_free_dict; } - if (subdir->parent) { - cd->pctx.ino2 = subdir->parent; + if (subdir_parent) { + cd->pctx.ino2 = subdir_parent; if (fix_problem(ctx, PR_2_LINK_DIR, &cd->pctx)) { dirent->inode = 0; @@ -588,23 +1075,57 @@ static int check_dir_block(ext2_filsys fs, goto next; } cd->pctx.ino2 = 0; - } else - subdir->parent = ino; + } else { + (void) e2fsck_dir_info_set_parent(ctx, + dirent->inode, ino); + } } - + + if (dups_found) { + ; + } else if (dict_lookup(&de_dict, dirent)) { + clear_problem_context(&pctx); + 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); + dups_found++; + } else + dict_alloc_insert(&de_dict, dirent, dirent); + ext2fs_icount_increment(ctx->inode_count, dirent->inode, &links); if (links > 1) ctx->fs_links_count++; ctx->fs_total_count++; next: - offset += dirent->rec_len; + prev = dirent; + if (dir_modified) + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); + offset += rec_len; + dot_state++; } while (offset < fs->blocksize); #if 0 printf("\n"); #endif +#ifdef ENABLE_HTREE + if (dx_db) { +#ifdef DX_DEBUG + printf("db_block %d, type %d, min_hash 0x%0x, max_hash 0x%0x\n", + db->blockcnt, dx_db->type, + dx_db->min_hash, dx_db->max_hash); +#endif + 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); + } +#endif /* ENABLE_HTREE */ if (offset != fs->blocksize) { - cd->pctx.num = dirent->rec_len - fs->blocksize + offset; + cd->pctx.num = rec_len - fs->blocksize + offset; if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { dirent->rec_len = cd->pctx.num; dir_modified++; @@ -614,14 +1135,17 @@ static int check_dir_block(ext2_filsys fs, cd->pctx.errcode = ext2fs_write_dir_block(fs, block_nr, buf); if (cd->pctx.errcode) { if (!fix_problem(ctx, PR_2_WRITE_DIRBLOCK, - &cd->pctx)) { - ctx->flags |= E2F_FLAG_ABORT; - return DIRENT_ABORT; - } + &cd->pctx)) + goto abort_free_dict; } ext2fs_mark_changed(fs); } + dict_free_nodes(&de_dict); return 0; +abort_free_dict: + ctx->flags |= E2F_FLAG_ABORT; + dict_free_nodes(&de_dict); + return DIRENT_ABORT; } /* @@ -630,20 +1154,23 @@ static int check_dir_block(ext2_filsys fs, */ static int deallocate_inode_block(ext2_filsys fs, blk_t *block_nr, - e2_blkcnt_t blockcnt, - blk_t ref_block, - int ref_offset, + e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), + blk_t ref_block EXT2FS_ATTR((unused)), + int ref_offset EXT2FS_ATTR((unused)), void *priv_data) { e2fsck_t ctx = (e2fsck_t) priv_data; - + if (HOLE_BLKADDR(*block_nr)) return 0; - ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); - ext2fs_unmark_block_bitmap(fs->block_map, *block_nr); + 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_block_alloc_stats2(fs, *block_nr, -1); return 0; } - + /* * This fuction deallocates an inode */ @@ -652,12 +1179,10 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) ext2_filsys fs = ctx->fs; struct ext2_inode inode; struct problem_context pctx; - - ext2fs_icount_store(ctx->inode_link_info, ino, 0); + __u32 count; + e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode"); - inode.i_links_count = 0; - inode.i_dtime = time(0); - e2fsck_write_inode(ctx, ino, &inode, "deallocate_inode"); + e2fsck_clear_inode(ctx, ino, &inode, 0, "deallocate_inode"); clear_problem_context(&pctx); pctx.ino = ino; @@ -665,27 +1190,39 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) * Fix up the bitmaps... */ e2fsck_read_bitmaps(ctx); - ext2fs_unmark_inode_bitmap(ctx->inode_used_map, ino); - ext2fs_unmark_inode_bitmap(ctx->inode_dir_map, ino); - if (ctx->inode_bad_map) - ext2fs_unmark_inode_bitmap(ctx->inode_bad_map, ino); - ext2fs_unmark_inode_bitmap(fs->inode_map, ino); - ext2fs_mark_ib_dirty(fs); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); + + if (ext2fs_file_acl_block(&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); + if (pctx.errcode == EXT2_ET_BAD_EA_BLOCK_NUM) { + pctx.errcode = 0; + count = 1; + } + if (pctx.errcode) { + pctx.blk = ext2fs_file_acl_block(&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_block_alloc_stats2(fs, + ext2fs_file_acl_block(&inode), + -1); + } + ext2fs_file_acl_block_set(&inode, 0); + } if (!ext2fs_inode_has_valid_blocks(&inode)) return; - if (!LINUX_S_ISDIR(inode.i_mode) && + if (LINUX_S_ISREG(inode.i_mode) && (inode.i_size_high || inode.i_size & 0x80000000UL)) ctx->large_files--; - if (inode.i_file_acl) { - ext2fs_unmark_block_bitmap(ctx->block_found_map, - inode.i_file_acl); - ext2fs_unmark_block_bitmap(fs->block_map, inode.i_file_acl); - } - - ext2fs_mark_bb_dirty(fs); pctx.errcode = ext2fs_block_iterate2(fs, ino, 0, block_buf, deallocate_inode_block, ctx); if (pctx.errcode) { @@ -695,12 +1232,28 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) } } +/* + * This fuction clears the htree flag on an inode + */ +static void clear_htree(e2fsck_t ctx, ext2_ino_t ino) +{ + struct ext2_inode inode; + + e2fsck_read_inode(ctx, ino, &inode, "clear_htree"); + inode.i_flags = inode.i_flags & ~EXT2_INDEX_FL; + e2fsck_write_inode(ctx, ino, &inode, "clear_htree"); + if (ctx->dirs_to_hash) + ext2fs_u32_list_add(ctx->dirs_to_hash, ino); +} + + extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, - ext2_ino_t ino) + ext2_ino_t ino, char *buf) { ext2_filsys fs = ctx->fs; struct ext2_inode inode; int inode_modified = 0; + int not_fixed = 0; unsigned char *frag, *fsize; struct problem_context pctx; int problem = 0; @@ -712,26 +1265,35 @@ 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) && + !(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); + inode_modified++; + } else + not_fixed++; + } + if (!LINUX_S_ISDIR(inode.i_mode) && !LINUX_S_ISREG(inode.i_mode) && !LINUX_S_ISCHR(inode.i_mode) && !LINUX_S_ISBLK(inode.i_mode) && !LINUX_S_ISLNK(inode.i_mode) && !LINUX_S_ISFIFO(inode.i_mode) && !(LINUX_S_ISSOCK(inode.i_mode))) problem = PR_2_BAD_MODE; else if (LINUX_S_ISCHR(inode.i_mode) - && !e2fsck_pass1_check_device_inode(&inode)) + && !e2fsck_pass1_check_device_inode(fs, &inode)) problem = PR_2_BAD_CHAR_DEV; else if (LINUX_S_ISBLK(inode.i_mode) - && !e2fsck_pass1_check_device_inode(&inode)) + && !e2fsck_pass1_check_device_inode(fs, &inode)) problem = PR_2_BAD_BLOCK_DEV; else if (LINUX_S_ISFIFO(inode.i_mode) - && !e2fsck_pass1_check_device_inode(&inode)) + && !e2fsck_pass1_check_device_inode(fs, &inode)) problem = PR_2_BAD_FIFO; else if (LINUX_S_ISSOCK(inode.i_mode) - && !e2fsck_pass1_check_device_inode(&inode)) + && !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, &inode)) { - problem = PR_2_SYMLINK_SIZE; + && !e2fsck_pass1_check_symlink(fs, ino, &inode, buf)) { + problem = PR_2_INVALID_SYMLINK; } if (problem) { @@ -740,29 +1302,24 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, if (ctx->flags & E2F_FLAG_SIGNAL_MASK) return 0; return 1; - } + } else + not_fixed++; problem = 0; } - - if (inode.i_faddr && - fix_problem(ctx, PR_2_FADDR_ZERO, &pctx)) { - inode.i_faddr = 0; - inode_modified++; + + if (inode.i_faddr) { + if (fix_problem(ctx, PR_2_FADDR_ZERO, &pctx)) { + inode.i_faddr = 0; + inode_modified++; + } else + not_fixed++; } switch (fs->super->s_creator_os) { - case EXT2_OS_LINUX: - frag = &inode.osd2.linux2.l_i_frag; - fsize = &inode.osd2.linux2.l_i_fsize; - break; case EXT2_OS_HURD: frag = &inode.osd2.hurd2.h_i_frag; fsize = &inode.osd2.hurd2.h_i_fsize; break; - case EXT2_OS_MASIX: - frag = &inode.osd2.masix2.m_i_frag; - fsize = &inode.osd2.masix2.m_i_fsize; - break; default: frag = fsize = 0; } @@ -771,7 +1328,8 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, if (fix_problem(ctx, PR_2_FRAG_ZERO, &pctx)) { *frag = 0; inode_modified++; - } + } else + not_fixed++; pctx.num = 0; } if (fsize && *fsize) { @@ -779,31 +1337,55 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, if (fix_problem(ctx, PR_2_FSIZE_ZERO, &pctx)) { *fsize = 0; inode_modified++; - } + } else + not_fixed++; pctx.num = 0; } - if (inode.i_file_acl && - !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) && - fix_problem(ctx, PR_2_FILE_ACL_ZERO, &pctx)) { - inode.i_file_acl = 0; - inode_modified++; + if ((fs->super->s_creator_os == EXT2_OS_LINUX) && + !(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) && + (inode.osd2.linux2.l_i_blocks_hi != 0)) { + pctx.num = inode.osd2.linux2.l_i_blocks_hi; + if (fix_problem(ctx, PR_2_BLOCKS_HI_ZERO, &pctx)) { + inode.osd2.linux2.l_i_blocks_hi = 0; + inode_modified++; + } + } + + if (!(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; + if (fix_problem(ctx, PR_2_I_FILE_ACL_HI_ZERO, &pctx)) { + inode.osd2.linux2.l_i_file_acl_high = 0; + inode_modified++; + } else + not_fixed++; } - if (inode.i_file_acl && - ((inode.i_file_acl < fs->super->s_first_data_block) || - (inode.i_file_acl >= fs->super->s_blocks_count)) && - fix_problem(ctx, PR_2_FILE_ACL_BAD, &pctx)) { - inode.i_file_acl = 0; - inode_modified++; + + 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 (fix_problem(ctx, PR_2_FILE_ACL_BAD, &pctx)) { + ext2fs_file_acl_block_set(&inode, 0); + inode_modified++; + } else + not_fixed++; } if (inode.i_dir_acl && - LINUX_S_ISDIR(inode.i_mode) && - fix_problem(ctx, PR_2_DIR_ACL_ZERO, &pctx)) { - inode.i_dir_acl = 0; - inode_modified++; + LINUX_S_ISDIR(inode.i_mode)) { + if (fix_problem(ctx, PR_2_DIR_ACL_ZERO, &pctx)) { + inode.i_dir_acl = 0; + inode_modified++; + } else + not_fixed++; } + if (inode_modified) e2fsck_write_inode(ctx, ino, &inode, "process_bad_inode"); + if (!not_fixed && ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); return 0; } @@ -816,10 +1398,11 @@ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, */ static int allocate_dir_block(e2fsck_t ctx, struct ext2_db_entry *db, - char *buf, struct problem_context *pctx) + char *buf EXT2FS_ATTR((unused)), + struct problem_context *pctx) { ext2_filsys fs = ctx->fs; - blk_t blk; + blk64_t blk; char *block; struct ext2_inode inode; @@ -831,18 +1414,18 @@ static int allocate_dir_block(e2fsck_t ctx, * them. */ e2fsck_read_bitmaps(ctx); - + /* * First, find a free block */ - pctx->errcode = ext2fs_new_block(fs, 0, ctx->block_found_map, &blk); + 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); /* @@ -861,7 +1444,7 @@ static int allocate_dir_block(e2fsck_t ctx, } pctx->errcode = ext2fs_write_dir_block(fs, blk, block); - ext2fs_free_mem((void **) &block); + ext2fs_free_mem(&block); if (pctx->errcode) { pctx->str = "ext2fs_write_dir_block"; fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx); @@ -872,7 +1455,7 @@ static int allocate_dir_block(e2fsck_t ctx, * Update the inode block count */ e2fsck_read_inode(ctx, db->ino, &inode, "allocate_dir_block"); - inode.i_blocks += fs->blocksize / 512; + ext2fs_iblk_add_blocks(fs, &inode, 1); if (inode.i_size < (db->blockcnt+1) * fs->blocksize) inode.i_size = (db->blockcnt+1) * fs->blocksize; e2fsck_write_inode(ctx, db->ino, &inode, "allocate_dir_block"); @@ -881,8 +1464,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); @@ -891,23 +1474,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, - blk_t *block_nr, - e2_blkcnt_t blockcnt, - blk_t ref_block, - int ref_offset, - 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; -}