* - The inode_bad_map bitmap
*/
-#include "et/com_err.h"
-
#include "e2fsck.h"
#include "problem.h"
/*
* Keeps track of how many times an inode is referenced.
*/
-ext2_icount_t inode_count = 0;
-
-static void deallocate_inode(ext2_filsys fs, ino_t ino,
+static void deallocate_inode(e2fsck_t ctx, ino_t ino,
char* block_buf);
-static int process_bad_inode(ext2_filsys fs, ino_t dir, ino_t ino);
+static int process_bad_inode(e2fsck_t ctx, ino_t dir, ino_t ino);
static int check_dir_block(ext2_filsys fs,
struct ext2_db_entry *dir_blocks_info,
- void *private);
-static int allocate_dir_block(ext2_filsys fs,
+ 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,
int blockcnt,
- void *private);
+ void *priv_data);
struct check_dir_struct {
char *buf;
struct problem_context pctx;
+ int count, max;
+ e2fsck_t ctx;
};
-void pass2(ext2_filsys fs)
+void e2fsck_pass2(e2fsck_t ctx)
{
+ ext2_filsys fs = ctx->fs;
char *buf;
+#ifdef RESOURCE_TRACK
struct resource_track rtrack;
+#endif
struct dir_info *dir;
- errcode_t retval;
- ino_t size;
struct check_dir_struct cd;
+#ifdef RESOURCE_TRACK
init_resource_track(&rtrack);
+#endif
+
+ clear_problem_context(&cd.pctx);
#ifdef MTRACE
mtrace_print("Pass 2");
#endif
- if (!preen)
- printf("Pass 2: Checking directory structure\n");
- size = ext2fs_get_icount_size(inode_link_info) + 10;
- retval = ext2fs_create_icount(fs, EXT2_ICOUNT_OPT_INCREMENT,
- size, &inode_count);
- if (retval) {
- com_err("ext2fs_create_icount", retval,
- "while creating inode_count");
- fatal_error(0);
+ 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 = allocate_memory(fs->blocksize, "directory scan buffer");
+ buf = (char *) e2fsck_allocate_memory(ctx, 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 = get_dir_info(EXT2_ROOT_INO);
+ dir = e2fsck_get_dir_info(ctx, EXT2_ROOT_INO);
if (dir)
dir->parent = EXT2_ROOT_INO;
cd.buf = buf;
- clear_problem_context(&cd.pctx);
+ cd.ctx = ctx;
+ cd.count = 0;
+ cd.max = ext2fs_dblist_count(fs->dblist);
- retval = ext2fs_dblist_iterate(fs->dblist, check_dir_block, &cd);
-
- free(buf);
+ 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;
+ }
+
+ ext2fs_free_mem((void **) &buf);
ext2fs_free_dblist(fs->dblist);
- if (inode_bad_map) {
- ext2fs_free_inode_bitmap(inode_bad_map);
- inode_bad_map = 0;
- }
- if (tflag > 1) {
- printf("Pass 2: ");
- print_resource_track(&rtrack);
+ if (ctx->inode_bad_map) {
+ ext2fs_free_inode_bitmap(ctx->inode_bad_map);
+ ctx->inode_bad_map = 0;
}
+#ifdef RESOURCE_TRACK
+ if (ctx->options & E2F_OPT_TIME2)
+ print_resource_track("Pass 2", &rtrack);
+#endif
}
/*
* Make sure the first entry in the directory is '.', and that the
* directory entry is sane.
*/
-static int check_dot(ext2_filsys fs,
+static int check_dot(e2fsck_t ctx,
struct ext2_dir_entry *dirent,
ino_t ino, struct problem_context *pctx)
{
if (!dirent->inode)
problem = PR_2_MISSING_DOT;
- else if ((dirent->name_len != 1) ||
+ 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(fs, problem, pctx)) {
+ if (fix_problem(ctx, problem, pctx)) {
if (dirent->rec_len < 12)
dirent->rec_len = 12;
dirent->inode = ino;
}
}
if (dirent->inode != ino) {
- if (fix_problem(fs, PR_2_BAD_INODE_DOT, pctx)) {
+ 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) {
- preenhalt(fs);
if (created ||
- ask("Directory entry for '.' is big. Split", 1)) {
+ fix_problem(ctx, PR_2_SPLIT_DOT, pctx)) {
nextdir = (struct ext2_dir_entry *)
((char *) dirent + 12);
dirent->rec_len = 12;
* directory entry is sane. We do not check the inode number of '..'
* here; this gets done in pass 3.
*/
-static int check_dotdot(ext2_filsys fs,
+static int check_dotdot(e2fsck_t ctx,
struct ext2_dir_entry *dirent,
struct dir_info *dir, struct problem_context *pctx)
{
if (!dirent->inode)
problem = PR_2_MISSING_DOT_DOT;
- else if ((dirent->name_len != 2) ||
+ else if (((dirent->name_len & 0xFF) != 2) ||
(dirent->name[0] != '.') ||
(dirent->name[1] != '.'))
problem = PR_2_2ND_NOT_DOT_DOT;
problem = PR_2_DOT_DOT_NULL_TERM;
if (problem) {
- if (fix_problem(fs, problem, pctx)) {
+ if (fix_problem(ctx, problem, pctx)) {
if (dirent->rec_len < 12)
dirent->rec_len = 12;
/*
* Check to make sure a directory entry doesn't contain any illegal
* characters.
*/
-static int check_name(ext2_filsys fs,
+static int check_name(e2fsck_t ctx,
struct ext2_dir_entry *dirent,
ino_t dir_ino, struct problem_context *pctx)
{
int fixup = -1;
int ret = 0;
- for ( i = 0; i < dirent->name_len; i++) {
+ for ( i = 0; i < (dirent->name_len & 0xFF); i++) {
if (dirent->name[i] == '/' || dirent->name[i] == '\0') {
if (fixup < 0) {
- fixup = fix_problem(fs, PR_2_BAD_NAME, pctx);
+ fixup = fix_problem(ctx, PR_2_BAD_NAME, pctx);
}
if (fixup) {
dirent->name[i] = '.';
static int check_dir_block(ext2_filsys fs,
struct ext2_db_entry *db,
- void *private)
+ void *priv_data)
{
struct dir_info *subdir, *dir;
struct ext2_dir_entry *dirent;
int offset = 0;
int dir_modified = 0;
- errcode_t retval;
int dot_state;
blk_t block_nr = db->blk;
ino_t ino = db->ino;
__u16 links;
- struct check_dir_struct *cd = private;
- char *buf = cd->buf;
+ struct check_dir_struct *cd;
+ char *buf;
+ e2fsck_t ctx;
+ int problem;
+
+ 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;
/*
* Make sure the inode is still in use (could have been
* deleted in the duplicate/bad blocks pass.
*/
- if (!(ext2fs_test_inode_bitmap(inode_used_map, ino)))
+ if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, ino)))
return 0;
cd->pctx.ino = ino;
cd->pctx.num = 0;
if (db->blk == 0) {
- if (allocate_dir_block(fs, db, buf, &cd->pctx))
+ if (allocate_dir_block(ctx, db, buf, &cd->pctx))
return 0;
block_nr = db->blk;
}
db->blockcnt, ino);
#endif
- retval = ext2fs_read_dir_block(fs, block_nr, buf);
- if (retval) {
- com_err(program_name, retval,
- "while reading directory block %d", block_nr);
+ cd->pctx.errcode = ext2fs_read_dir_block(fs, block_nr, buf);
+ 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);
}
do {
dot_state++;
+ 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 < 8) ||
((dirent->rec_len % 4) != 0) ||
- ((dirent->name_len+8) > dirent->rec_len)) {
- if (fix_problem(fs, PR_2_DIR_CORRUPTED, &cd->pctx)) {
+ (((dirent->name_len & 0xFF)+8) > dirent->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;
} else
return DIRENT_ABORT;
}
-
- if (dirent->name_len > EXT2_NAME_LEN) {
- if (fix_problem(fs, PR_2_FILENAME_LONG, &cd->pctx)) {
+ 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 == 1) {
- if (check_dot(fs, dirent, ino, &cd->pctx))
+ if (check_dot(ctx, dirent, ino, &cd->pctx))
dir_modified++;
} else if (dot_state == 2) {
- dir = get_dir_info(ino);
+ dir = e2fsck_get_dir_info(ctx, ino);
if (!dir) {
- printf("Internal error: couldn't find dir_info for %lu\n",
- ino);
- fatal_error(0);
+ fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx);
+ ctx->flags |= E2F_FLAG_ABORT;
+ return DIRENT_ABORT;
}
- if (check_dotdot(fs, dirent, dir, &cd->pctx))
+ if (check_dotdot(ctx, dirent, dir, &cd->pctx))
dir_modified++;
} else if (dirent->inode == ino) {
- if (fix_problem(fs, PR_2_LINK_DOT, &cd->pctx)) {
+ 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;
- if (check_name(fs, dirent, ino, &cd->pctx))
- dir_modified++;
-
/*
* 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)) {
- if (fix_problem(fs, PR_2_BAD_INO, &cd->pctx)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
- }
-
- /*
- * If the inode is unused, offer to clear it.
- */
- if (!(ext2fs_test_inode_bitmap(inode_used_map,
+ problem = PR_2_BAD_INO;
+ } else if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map,
dirent->inode))) {
- if (fix_problem(fs, PR_2_UNUSED_INODE, &cd->pctx)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
+ /*
+ * 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 > 2) &&
+ ((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 > 2) &&
+ ((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 > 2) &&
+ (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;
}
- /*
- * If the inode is in a bad block, offer to clear it.
- */
- if (inode_bb_map &&
- (ext2fs_test_inode_bitmap(inode_bb_map,
- dirent->inode))) {
- if (fix_problem(fs, PR_2_BB_INODE, &cd->pctx)) {
+ 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;
}
}
* (We wait until now so that we can display the
* pathname to the user.)
*/
- if (inode_bad_map &&
- ext2fs_test_inode_bitmap(inode_bad_map,
+ if (ctx->inode_bad_map &&
+ ext2fs_test_inode_bitmap(ctx->inode_bad_map,
dirent->inode)) {
- if (process_bad_inode(fs, ino, dirent->inode)) {
+ if (process_bad_inode(ctx, ino, dirent->inode)) {
dirent->inode = 0;
dir_modified++;
goto next;
}
+ if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+ return DIRENT_ABORT;
}
- /*
- * 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.
- */
- if ((dot_state > 2) && (dirent->inode == EXT2_ROOT_INO)) {
- if (fix_problem(fs, PR_2_LINK_ROOT, &cd->pctx)) {
- dirent->inode = 0;
- dir_modified++;
- goto next;
- }
- }
-
+ if (check_name(ctx, dirent, ino, &cd->pctx))
+ dir_modified++;
+
/*
* If this is a directory, then mark its parent in its
* dir_info structure. If the parent field is already
* and ask the user if he/she wants to clear this one.
*/
if ((dot_state > 2) &&
- (ext2fs_test_inode_bitmap(inode_dir_map,
+ (ext2fs_test_inode_bitmap(ctx->inode_dir_map,
dirent->inode))) {
- subdir = get_dir_info(dirent->inode);
+ subdir = e2fsck_get_dir_info(ctx, dirent->inode);
if (!subdir) {
- printf("INTERNAL ERROR: missing dir %u\n",
- dirent->inode);
- fatal_error(0);
+ cd->pctx.ino = dirent->inode;
+ fix_problem(ctx, PR_2_NO_DIRINFO, &cd->pctx);
+ ctx->flags |= E2F_FLAG_ABORT;
+ return DIRENT_ABORT;
}
if (subdir->parent) {
cd->pctx.ino2 = subdir->parent;
- if (fix_problem(fs, PR_2_LINK_DIR,
+ if (fix_problem(ctx, PR_2_LINK_DIR,
&cd->pctx)) {
dirent->inode = 0;
dir_modified++;
subdir->parent = ino;
}
- ext2fs_icount_increment(inode_count, dirent->inode, &links);
+ ext2fs_icount_increment(ctx->inode_count, dirent->inode,
+ &links);
if (links > 1)
- fs_links_count++;
- fs_total_count++;
+ ctx->fs_links_count++;
+ ctx->fs_total_count++;
next:
offset += dirent->rec_len;
} while (offset < fs->blocksize);
printf("\n");
#endif
if (offset != fs->blocksize) {
- printf("Final rec_len is %d, should be %d\n",
- dirent->rec_len,
- dirent->rec_len - fs->blocksize + offset);
+ 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) {
- retval = ext2fs_write_dir_block(fs, block_nr, buf);
- if (retval) {
- com_err(program_name, retval,
- "while writing directory block %d", block_nr);
+ 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;
+ }
}
ext2fs_mark_changed(fs);
}
static int deallocate_inode_block(ext2_filsys fs,
blk_t *block_nr,
int blockcnt,
- void *private)
+ void *priv_data)
{
+ e2fsck_t ctx = (e2fsck_t) priv_data;
+
if (!*block_nr)
return 0;
- ext2fs_unmark_block_bitmap(block_found_map, *block_nr);
+ ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr);
ext2fs_unmark_block_bitmap(fs->block_map, *block_nr);
return 0;
}
/*
* This fuction deallocates an inode
*/
-static void deallocate_inode(ext2_filsys fs, ino_t ino,
+static void deallocate_inode(e2fsck_t ctx, ino_t ino,
char* block_buf)
{
- errcode_t retval;
+ ext2_filsys fs = ctx->fs;
struct ext2_inode inode;
-
- ext2fs_icount_store(inode_link_info, ino, 0);
- e2fsck_read_inode(fs, ino, &inode, "deallocate_inode");
+ struct problem_context pctx;
+
+ 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(fs, ino, &inode, "deallocate_inode");
+ e2fsck_write_inode(ctx, ino, &inode, "deallocate_inode");
+ clear_problem_context(&pctx);
+ pctx.ino = ino;
/*
* Fix up the bitmaps...
*/
- read_bitmaps(fs);
- ext2fs_unmark_inode_bitmap(inode_used_map, ino);
- ext2fs_unmark_inode_bitmap(inode_dir_map, ino);
- if (inode_bad_map)
- ext2fs_unmark_inode_bitmap(inode_bad_map, ino);
+ 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);
return;
ext2fs_mark_bb_dirty(fs);
- retval = ext2fs_block_iterate(fs, ino, 0, block_buf,
- deallocate_inode_block, 0);
- if (retval)
- com_err("deallocate_inode", retval,
- "while calling ext2fs_block_iterate for inode %d",
- ino);
+ pctx.errcode = ext2fs_block_iterate(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;
+ }
}
-static int process_bad_inode(ext2_filsys fs, ino_t dir, ino_t ino)
+static int process_bad_inode(e2fsck_t ctx, ino_t dir, ino_t ino)
{
+ ext2_filsys fs = ctx->fs;
struct ext2_inode inode;
int inode_modified = 0;
unsigned char *frag, *fsize;
struct problem_context pctx;
+ int problem = 0;
- e2fsck_read_inode(fs, ino, &inode, "process_bad_inode");
+ e2fsck_read_inode(ctx, ino, &inode, "process_bad_inode");
clear_problem_context(&pctx);
pctx.ino = ino;
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))) {
- if (fix_problem(fs, PR_2_BAD_MODE, &pctx)) {
- deallocate_inode(fs, ino, 0);
+ !(LINUX_S_ISSOCK(inode.i_mode)))
+ problem = PR_2_BAD_MODE;
+
+ if (LINUX_S_ISCHR(inode.i_mode)
+ && !e2fsck_pass1_check_device_inode(&inode))
+ problem = PR_2_BAD_CHAR_DEV;
+
+ if (LINUX_S_ISBLK(inode.i_mode)
+ && !e2fsck_pass1_check_device_inode(&inode))
+ problem = PR_2_BAD_BLOCK_DEV;
+
+ if (problem) {
+ if (fix_problem(ctx, problem, &pctx)) {
+ deallocate_inode(ctx, ino, 0);
+ if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+ return 0;
return 1;
}
+ problem = 0;
}
+
if (inode.i_faddr &&
- fix_problem(fs, PR_2_FADDR_ZERO, &pctx)) {
+ fix_problem(ctx, PR_2_FADDR_ZERO, &pctx)) {
inode.i_faddr = 0;
inode_modified++;
}
}
if (frag && *frag) {
pctx.num = *frag;
- if (fix_problem(fs, PR_2_FRAG_ZERO, &pctx)) {
+ if (fix_problem(ctx, PR_2_FRAG_ZERO, &pctx)) {
*frag = 0;
inode_modified++;
}
}
if (fsize && *fsize) {
pctx.num = *fsize;
- if (fix_problem(fs, PR_2_FSIZE_ZERO, &pctx)) {
+ if (fix_problem(ctx, PR_2_FSIZE_ZERO, &pctx)) {
*fsize = 0;
inode_modified++;
}
}
if (inode.i_file_acl &&
- fix_problem(fs, PR_2_FILE_ACL_ZERO, &pctx)) {
+ fix_problem(ctx, PR_2_FILE_ACL_ZERO, &pctx)) {
inode.i_file_acl = 0;
inode_modified++;
}
if (inode.i_dir_acl &&
- fix_problem(fs, PR_2_DIR_ACL_ZERO, &pctx)) {
+ LINUX_S_ISDIR(inode.i_mode) &&
+ fix_problem(ctx, PR_2_DIR_ACL_ZERO, &pctx)) {
inode.i_dir_acl = 0;
inode_modified++;
}
if (inode_modified)
- e2fsck_write_inode(fs, ino, &inode, "process_bad_inode");
+ e2fsck_write_inode(ctx, ino, &inode, "process_bad_inode");
return 0;
}
* 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(ext2_filsys fs,
+static int allocate_dir_block(e2fsck_t ctx,
struct ext2_db_entry *db,
char *buf, struct problem_context *pctx)
{
+ ext2_filsys fs = ctx->fs;
blk_t blk;
char *block;
struct ext2_inode inode;
- errcode_t retval;
- if (fix_problem(fs, PR_2_DIRECTORY_HOLE, pctx) == 0)
+ 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.
*/
- read_bitmaps(fs);
+ e2fsck_read_bitmaps(ctx);
/*
* First, find a free block
*/
- retval = ext2fs_new_block(fs, 0, block_found_map, &blk);
- if (retval) {
- com_err("allocate_dir_block", retval,
- "while trying to fill a hole in a directory inode");
+ 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(block_found_map, blk);
+ 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)
- retval = ext2fs_new_dir_block(fs, 0, 0, &block);
+ pctx->errcode = ext2fs_new_dir_block(fs, 0, 0, &block);
else
- retval = ext2fs_new_dir_block(fs, db->ino, EXT2_ROOT_INO,
- &block);
+ pctx->errcode = ext2fs_new_dir_block(fs, db->ino,
+ EXT2_ROOT_INO, &block);
- if (retval) {
- com_err("allocate_dir_block", retval,
- "while creating new directory block");
+ if (pctx->errcode) {
+ pctx->str = "ext2fs_new_dir_block";
+ fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
return 1;
}
- retval = ext2fs_write_dir_block(fs, blk, block);
- free(block);
- if (retval) {
- com_err("allocate_dir_block", retval,
- "while writing an empty directory block");
+ pctx->errcode = ext2fs_write_dir_block(fs, blk, block);
+ ext2fs_free_mem((void **) &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(fs, db->ino, &inode, "allocate_dir_block");
+ 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(fs, db->ino, &inode, "allocate_dir_block");
+ e2fsck_write_inode(ctx, db->ino, &inode, "allocate_dir_block");
/*
* Finally, update the block pointers for the inode
*/
db->blk = blk;
- retval = ext2fs_block_iterate(fs, db->ino, BLOCK_FLAG_HOLE,
+ pctx->errcode = ext2fs_block_iterate(fs, db->ino, BLOCK_FLAG_HOLE,
0, update_dir_block, db);
- if (retval) {
- com_err("allocate_dir_block", retval,
- "while calling ext2fs_block_iterate");
+ if (pctx->errcode) {
+ pctx->str = "ext2fs_block_iterate";
+ fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
return 1;
}
static int update_dir_block(ext2_filsys fs,
blk_t *block_nr,
int blockcnt,
- void *private)
+ void *priv_data)
{
- struct ext2_db_entry *db = private;
+ struct ext2_db_entry *db;
+ db = (struct ext2_db_entry *) priv_data;
if (db->blockcnt == blockcnt) {
*block_nr = db->blk;
return BLOCK_CHANGED;
}
return 0;
}
-
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff