summaryrefslogtreecommitdiff
path: root/e2fsprogs/e2fsck/pass2.c
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs/e2fsck/pass2.c')
-rw-r--r--e2fsprogs/e2fsck/pass2.c1414
1 files changed, 0 insertions, 1414 deletions
diff --git a/e2fsprogs/e2fsck/pass2.c b/e2fsprogs/e2fsck/pass2.c
deleted file mode 100644
index 69599ff..0000000
--- a/e2fsprogs/e2fsck/pass2.c
+++ /dev/null
@@ -1,1414 +0,0 @@
-/*
- * 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:
- *
- * - The length of the directory entry (rec_len) should be at
- * 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).
- * - The inode number in the directory entry should be within
- * legal bounds.
- * - The inode number should refer to a in-use inode.
- * - The first entry should be '.', and its inode should be
- * the inode of the directory.
- * - The second entry should be '..'.
- *
- * To minimize disk seek time, the directory blocks are processed in
- * sorted order of block numbers.
- *
- * Pass 2 also collects the following information:
- * - The inode numbers of the subdirectories for each directory.
- *
- * 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_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 <string.h>
-
-#include "e2fsck.h"
-#include "problem.h"
-#include "dict.h"
-
-#ifdef NO_INLINE_FUNCS
-#define _INLINE_
-#else
-#define _INLINE_ inline
-#endif
-
-/* #define DX_DEBUG */
-
-/*
- * Keeps track of how many times an inode is referenced.
- */
-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,
- void *priv_data);
-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)
-{
- struct ext2_super_block *sb = ctx->fs->super;
- struct problem_context pctx;
- ext2_filsys fs = ctx->fs;
- char *buf;
-#ifdef RESOURCE_TRACK
- struct resource_track rtrack;
-#endif
- struct dir_info *dir;
- struct check_dir_struct cd;
- 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;
-
-#ifdef RESOURCE_TRACK
- init_resource_track(&rtrack);
-#endif
-
- clear_problem_context(&cd.pctx);
-
-#ifdef MTRACE
- mtrace_print("Pass 2");
-#endif
-
- 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,
- 0, ctx->inode_link_info,
- &ctx->inode_count);
- if (cd.pctx.errcode) {
- fix_problem(ctx, PR_2_ALLOCATE_ICOUNT, &cd.pctx);
- ctx->flags |= E2F_FLAG_ABORT;
- return;
- }
- buf = (char *) e2fsck_allocate_memory(ctx, 2*fs->blocksize,
- "directory scan buffer");
-
- /*
- * Set up the parent pointer for the root directory, if
- * 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;
-
- cd.buf = buf;
- cd.ctx = ctx;
- cd.count = 1;
- cd.max = ext2fs_dblist_count(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)
- return;
- if (cd.pctx.errcode) {
- fix_problem(ctx, PR_2_DBLIST_ITERATE, &cd.pctx);
- ctx->flags |= E2F_FLAG_ABORT;
- return;
- }
-
-#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) {
- 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 (code == 0)
- continue;
- }
- if (bad_dir && fix_problem(ctx, PR_2_HTREE_CLEAR, &pctx)) {
- clear_htree(ctx, dx_dir->ino);
- dx_dir->numblocks = 0;
- }
- }
-#endif
- 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;
- }
-
- clear_problem_context(&pctx);
- if (ctx->large_files) {
- if (!(sb->s_feature_ro_compat &
- EXT2_FEATURE_RO_COMPAT_LARGE_FILE) &&
- fix_problem(ctx, PR_2_FEATURE_LARGE_FILES, &pctx)) {
- sb->s_feature_ro_compat |=
- EXT2_FEATURE_RO_COMPAT_LARGE_FILE;
- ext2fs_mark_super_dirty(fs);
- }
- if (sb->s_rev_level == EXT2_GOOD_OLD_REV &&
- fix_problem(ctx, PR_1_FS_REV_LEVEL, &pctx)) {
- 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);
- }
-#endif
-}
-
-#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++;
- }
- 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.
- */
-static int check_dot(e2fsck_t ctx,
- struct ext2_dir_entry *dirent,
- ext2_ino_t ino, struct problem_context *pctx)
-{
- struct ext2_dir_entry *nextdir;
- 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) ||
- (dirent->name[0] != '.'))
- problem = PR_2_1ST_NOT_DOT;
- else if (dirent->name[1] != '\0')
- problem = PR_2_DOT_NULL_TERM;
-
- if (problem) {
- if (fix_problem(ctx, problem, pctx)) {
- if (dirent->rec_len < 12)
- dirent->rec_len = 12;
- dirent->inode = ino;
- dirent->name_len = 1;
- dirent->name[0] = '.';
- dirent->name[1] = '\0';
- status = 1;
- created = 1;
- }
- }
- if (dirent->inode != ino) {
- if (fix_problem(ctx, PR_2_BAD_INODE_DOT, pctx)) {
- dirent->inode = ino;
- status = 1;
- }
- }
- if (dirent->rec_len > 12) {
- new_len = dirent->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;
- nextdir->inode = 0;
- nextdir->name_len = 0;
- status = 1;
- }
- }
- }
- return status;
-}
-
-/*
- * Make sure the second entry in the directory is '..', and that the
- * directory entry is sane. We do not check the inode number of '..'
- * here; this gets done in pass 3.
- */
-static int check_dotdot(e2fsck_t ctx,
- struct ext2_dir_entry *dirent,
- struct dir_info *dir, struct problem_context *pctx)
-{
- int problem = 0;
-
- if (!dirent->inode)
- problem = PR_2_MISSING_DOT_DOT;
- else if (((dirent->name_len & 0xFF) != 2) ||
- (dirent->name[0] != '.') ||
- (dirent->name[1] != '.'))
- problem = PR_2_2ND_NOT_DOT_DOT;
- else if (dirent->name[2] != '\0')
- problem = PR_2_DOT_DOT_NULL_TERM;
-
- if (problem) {
- if (fix_problem(ctx, problem, pctx)) {
- if (dirent->rec_len < 12)
- dirent->rec_len = 12;
- /*
- * Note: we don't have the parent inode just
- * yet, so we will fill it in with the root
- * inode. This will get fixed in pass 3.
- */
- dirent->inode = EXT2_ROOT_INO;
- dirent->name_len = 2;
- dirent->name[0] = '.';
- dirent->name[1] = '.';
- dirent->name[2] = '\0';
- return 1;
- }
- return 0;
- }
- dir->dotdot = dirent->inode;
- return 0;
-}
-
-/*
- * Check to make sure a directory entry doesn't contain any illegal
- * characters.
- */
-static int check_name(e2fsck_t ctx,
- struct ext2_dir_entry *dirent,
- 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) {
- fixup = fix_problem(ctx, PR_2_BAD_NAME, pctx);
- }
- if (fixup) {
- dirent->name[i] = '.';
- ret = 1;
- }
- }
- }
- return ret;
-}
-
-/*
- * Check the directory filetype (if present)
- */
-static _INLINE_ int check_filetype(e2fsck_t ctx,
- 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;
- struct ext2_inode inode;
-
- if (!(ctx->fs->super->s_feature_incompat &
- EXT2_FEATURE_INCOMPAT_FILETYPE)) {
- if (filetype == 0 ||
- !fix_problem(ctx, PR_2_CLEAR_FILETYPE, pctx))
- return 0;
- dirent->name_len = dirent->name_len & 0xFF;
- return 1;
- }
-
- if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, dirent->inode)) {
- should_be = EXT2_FT_DIR;
- } else if (ext2fs_test_inode_bitmap(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))
- should_be = 0;
- else {
- e2fsck_read_inode(ctx, dirent->inode, &inode,
- "check_filetype");
- should_be = ext2_file_type(inode.i_mode);
- }
- if (filetype == should_be)
- return 0;
- pctx->num = should_be;
-
- 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: %d\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 %d\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;
- }
- 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 = fs->blocksize - *offset - dirent->rec_len;
- int name_len = dirent->name_len & 0xFF;
-
- /*
- * 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) && (dirent->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) &&
- (name_len + 8 <= dirent->rec_len + left) &&
- dirent->inode <= fs->super->s_inodes_count &&
- strnlen(dirent->name, name_len) == name_len) {
- dirent->rec_len += left;
- return;
- }
- /*
- * If the directory entry is a multiple of four, so it is
- * valid, let the previous directory entry absorb the invalid
- * one.
- */
- if (prev && dirent->rec_len && (dirent->rec_len % 4) == 0) {
- prev->rec_len += dirent->rec_len;
- *offset += dirent->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) {
- prev->rec_len += fs->blocksize - *offset;
- *offset = fs->blocksize;
- } else {
- dirent->rec_len = fs->blocksize - *offset;
- 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 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;
- int dir_modified = 0;
- int dot_state;
- blk_t block_nr = db->blk;
- ext2_ino_t ino = db->ino;
- __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;
-
- cd = (struct check_dir_struct *) priv_data;
- buf = cd->buf;
- ctx = cd->ctx;
-
- if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
- 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
- * deleted in the duplicate/bad blocks pass.
- */
- if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, ino)))
- return 0;
-
- cd->pctx.ino = ino;
- cd->pctx.blk = block_nr;
- cd->pctx.blkcount = db->blockcnt;
- cd->pctx.ino2 = 0;
- cd->pctx.dirent = 0;
- cd->pctx.num = 0;
-
- if (db->blk == 0) {
- if (allocate_dir_block(ctx, db, buf, &cd->pctx))
- 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
-
- cd->pctx.errcode = ext2fs_read_dir_block(fs, block_nr, buf);
- if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED)
- cd->pctx.errcode = 0; /* We'll handle this ourselves */
- if (cd->pctx.errcode) {
- if (!fix_problem(ctx, PR_2_READ_DIRBLOCK, &cd->pctx)) {
- ctx->flags |= E2F_FLAG_ABORT;
- return DIRENT_ABORT;
- }
- 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) {
- printf("XXX should never happen!!!\n");
- abort();
- }
- 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;
- 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;
- dx_dir->depth = root->indirect_levels + 1;
- } else if ((dirent->inode == 0) &&
- (dirent->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;
- }
-#endif /* ENABLE_HTREE */
-
- dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
- prev = 0;
- do {
- problem = 0;
- dirent = (struct ext2_dir_entry *) (buf + offset);
- 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 (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) {
- salvage_directory(fs, dirent, prev, &offset);
- dir_modified++;
- continue;
- } 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))
- dir_modified++;
- } else if (dot_state == 1) {
- dir = e2fsck_get_dir_info(ctx, ino);
- if (!dir) {
- fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx);
- goto abort_free_dict;
- }
- if (check_dotdot(ctx, dirent, dir, &cd->pctx))
- dir_modified++;
- } else if (dirent->inode == ino) {
- problem = PR_2_LINK_DOT;
- if (fix_problem(ctx, PR_2_LINK_DOT, &cd->pctx)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
- }
- 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,
- dirent->inode))) {
- /*
- * If the inode is in a bad block, offer to
- * clear it.
- */
- problem = PR_2_BB_INODE;
- } else if ((dot_state > 1) &&
- ((dirent->name_len & 0xFF) == 1) &&
- (dirent->name[0] == '.')) {
- /*
- * If there's a '.' entry in anything other
- * than the first directory entry, it's a
- * duplicate entry that should be removed.
- */
- problem = PR_2_DUP_DOT;
- } else if ((dot_state > 1) &&
- ((dirent->name_len & 0xFF) == 2) &&
- (dirent->name[0] == '.') &&
- (dirent->name[1] == '.')) {
- /*
- * If there's a '..' entry in anything other
- * than the second directory entry, it's a
- * duplicate entry that should be removed.
- */
- problem = PR_2_DUP_DOT_DOT;
- } else if ((dot_state > 1) &&
- (dirent->inode == EXT2_ROOT_INO)) {
- /*
- * Don't allow links to the root directory.
- * We check this specially to make sure we
- * catch this error case even if the root
- * directory hasn't been created yet.
- */
- problem = PR_2_LINK_ROOT;
- } else if ((dot_state > 1) &&
- (dirent->name_len & 0xFF) == 0) {
- /*
- * Don't allow zero-length directory names.
- */
- problem = PR_2_NULL_NAME;
- }
-
- 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 the inode was marked as having bad fields in
- * pass1, process it and offer to fix/clear it.
- * (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,
- buf + fs->blocksize)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
- if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
- return DIRENT_ABORT;
- }
-
- 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
- * filled in, then this directory has more than one
- * hard link. We assume the first link is correct,
- * and ask the user if he/she wants to clear this one.
- */
- if ((dot_state > 1) &&
- (ext2fs_test_inode_bitmap(ctx->inode_dir_map,
- dirent->inode))) {
- subdir = e2fsck_get_dir_info(ctx, dirent->inode);
- if (!subdir) {
- cd->pctx.ino = dirent->inode;
- fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx);
- goto abort_free_dict;
- }
- if (subdir->parent) {
- cd->pctx.ino2 = subdir->parent;
- if (fix_problem(ctx, PR_2_LINK_DIR,
- &cd->pctx)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
- cd->pctx.ino2 = 0;
- } else
- subdir->parent = 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:
- prev = dirent;
- offset += dirent->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;
- 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);
- if (cd->pctx.errcode) {
- if (!fix_problem(ctx, PR_2_WRITE_DIRBLOCK,
- &cd->pctx))
- goto abort_free_dict;
- }
- ext2fs_mark_changed(fs);
- }
- dict_free_nodes(&de_dict);
- return 0;
-abort_free_dict:
- dict_free_nodes(&de_dict);
- ctx->flags |= E2F_FLAG_ABORT;
- return DIRENT_ABORT;
-}
-
-/*
- * 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,
- 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;
- if ((*block_nr < fs->super->s_first_data_block) ||
- (*block_nr >= fs->super->s_blocks_count))
- return 0;
- ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr);
- ext2fs_block_alloc_stats(fs, *block_nr, -1);
- return 0;
-}
-
-/*
- * This fuction deallocates an inode
- */
-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;
- __u32 count;
-
- ext2fs_icount_store(ctx->inode_link_info, ino, 0);
- 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");
- clear_problem_context(&pctx);
- pctx.ino = ino;
-
- /*
- * 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_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode));
-
- if (inode.i_file_acl &&
- (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);
- if (pctx.errcode == EXT2_ET_BAD_EA_BLOCK_NUM) {
- pctx.errcode = 0;
- count = 1;
- }
- if (pctx.errcode) {
- pctx.blk = inode.i_file_acl;
- 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);
- }
- inode.i_file_acl = 0;
- }
-
- if (!ext2fs_inode_has_valid_blocks(&inode))
- return;
-
- if (LINUX_S_ISREG(inode.i_mode) &&
- (inode.i_size_high || inode.i_size & 0x80000000UL))
- ctx->large_files--;
-
- pctx.errcode = ext2fs_block_iterate2(fs, ino, 0, block_buf,
- deallocate_inode_block, ctx);
- if (pctx.errcode) {
- fix_problem(ctx, PR_2_DEALLOC_INODE, &pctx);
- ctx->flags |= E2F_FLAG_ABORT;
- return;
- }
-}
-
-/*
- * 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, 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;
-
- e2fsck_read_inode(ctx, ino, &inode, "process_bad_inode");
-
- clear_problem_context(&pctx);
- pctx.ino = ino;
- pctx.dir = dir;
- pctx.inode = &inode;
-
- 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;
-#ifdef EXT2FS_ENABLE_SWAPFS
- /*
- * This is a special kludge to deal with long symlinks
- * on big endian systems. i_blocks had already been
- * decremented earlier in pass 1, but since i_file_acl
- * hadn't yet been cleared, ext2fs_read_inode()
- * assumed that the file was short symlink and would
- * not have byte swapped i_block[0]. Hence, we have
- * to byte-swap it here.
- */
- if (LINUX_S_ISLNK(inode.i_mode) &&
- (fs->flags & EXT2_FLAG_SWAP_BYTES) &&
- (inode.i_blocks == fs->blocksize >> 9))
- inode.i_block[0] = ext2fs_swab32(inode.i_block[0]);
-#endif
- 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(fs, &inode))
- problem = PR_2_BAD_CHAR_DEV;
- else if (LINUX_S_ISBLK(inode.i_mode)
- && !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(fs, &inode))
- problem = PR_2_BAD_FIFO;
- 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, &inode, buf)) {
- problem = PR_2_INVALID_SYMLINK;
- }
-
- if (problem) {
- if (fix_problem(ctx, problem, &pctx)) {
- deallocate_inode(ctx, ino, 0);
- if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
- return 0;
- return 1;
- } else
- not_fixed++;
- problem = 0;
- }
-
- 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;
- }
- if (frag && *frag) {
- pctx.num = *frag;
- if (fix_problem(ctx, PR_2_FRAG_ZERO, &pctx)) {
- *frag = 0;
- inode_modified++;
- } else
- not_fixed++;
- pctx.num = 0;
- }
- if (fsize && *fsize) {
- pctx.num = *fsize;
- if (fix_problem(ctx, PR_2_FSIZE_ZERO, &pctx)) {
- *fsize = 0;
- inode_modified++;
- } else
- not_fixed++;
- pctx.num = 0;
- }
-
- 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 (fix_problem(ctx, PR_2_FILE_ACL_BAD, &pctx)) {
- inode.i_file_acl = 0;
- inode_modified++;
- } else
- not_fixed++;
- }
- if (inode.i_dir_acl &&
- 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)
- ext2fs_unmark_inode_bitmap(ctx->inode_bad_map, ino);
- return 0;
-}
-
-
-/*
- * allocate_dir_block --- this function allocates a new directory
- * block for a particular inode; this is done if a directory has
- * a "hole" in it, or if a directory has a illegal block number
- * that was zeroed out and now needs to be replaced.
- */
-static int allocate_dir_block(e2fsck_t ctx,
- struct ext2_db_entry *db,
- char *buf EXT2FS_ATTR((unused)),
- struct problem_context *pctx)
-{
- ext2_filsys fs = ctx->fs;
- blk_t blk;
- char *block;
- struct ext2_inode inode;
-
- if (fix_problem(ctx, PR_2_DIRECTORY_HOLE, pctx) == 0)
- return 1;
-
- /*
- * Read the inode and block bitmaps in; we'll be messing with
- * them.
- */
- e2fsck_read_bitmaps(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;
- }
- ext2fs_mark_block_bitmap(ctx->block_found_map, blk);
- ext2fs_mark_block_bitmap(fs->block_map, blk);
- ext2fs_mark_bb_dirty(fs);
-
- /*
- * Now let's create the actual data block for the inode
- */
- if (db->blockcnt)
- pctx->errcode = ext2fs_new_dir_block(fs, 0, 0, &block);
- else
- pctx->errcode = ext2fs_new_dir_block(fs, db->ino,
- EXT2_ROOT_INO, &block);
-
- if (pctx->errcode) {
- pctx->str = "ext2fs_new_dir_block";
- fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
- return 1;
- }
-
- pctx->errcode = ext2fs_write_dir_block(fs, blk, block);
- ext2fs_free_mem(&block);
- if (pctx->errcode) {
- pctx->str = "ext2fs_write_dir_block";
- fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
- return 1;
- }
-
- /*
- * Update the inode block count
- */
- e2fsck_read_inode(ctx, db->ino, &inode, "allocate_dir_block");
- inode.i_blocks += fs->blocksize / 512;
- 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");
-
- /*
- * 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);
- if (pctx->errcode) {
- pctx->str = "ext2fs_block_iterate";
- fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
- return 1;
- }
-
- 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;
-}