X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fpass3.c;h=a14bc5d5405202e27e10de914e2dfdee04d6d754;hb=3a4ec2ba0f5528c3cc59e6ab0503496a300ac194;hp=a33a84d45f2666db8a1213a18d797b13bbc4e8ac;hpb=7f88b04341d88c5df0360d930832c38040303b61;p=tools%2Fe2fsprogs.git

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index a33a84d..a14bc5d 100644
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -1,16 +1,20 @@
 /*
  * pass3.c -- pass #3 of e2fsck: Check for directory connectivity
  *
- * Copyright (C) 1993 Theodore Ts'o.  This file may be redistributed
- * under the terms of the GNU Public License.
- * 
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ *
  * Pass #3 assures that all directories are connected to the
  * filesystem tree, using the following algorithm:
  *
  * First, the root directory is checked to make sure it exists; if
  * not, e2fsck will offer to create a new one.  It is then marked as
  * "done".
- * 
+ *
  * Then, pass3 interates over all directory inodes; for each directory
  * it attempts to trace up the filesystem tree, using dirinfo.parent
  * until it reaches a directory which has been marked "done".  If it
@@ -20,11 +24,11 @@
  * twice, then it has detected a filesystem loop, and it will again
  * offer to reconnect the directory to /lost+found in to break the
  * filesystem loop.
- * 
- * Pass 3 also contains the subroutine, reconnect_file() to reconnect
- * inodes to /lost+found; this subroutine is also used by pass 4.
- * reconnect_file() calls get_lost_and_found(), which is responsible
- * for creating /lost+found if it does not exist.
+ *
+ * Pass 3 also contains the subroutine, e2fsck_reconnect_file() to
+ * reconnect inodes to /lost+found; this subroutine is also used by
+ * pass 4.  e2fsck_reconnect_file() calls get_lost_and_found(), which
+ * is responsible for creating /lost+found if it does not exist.
  *
  * Pass 3 frees the following data structures:
  *     	- The dirinfo directory information cache.
@@ -33,149 +37,187 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include "et/com_err.h"
 
 #include "e2fsck.h"
+#include "problem.h"
 
-static void check_root(ext2_filsys fs, ino_t root_ino);
-static void check_directory(ext2_filsys fs, ino_t dir);
-static ino_t get_lost_and_found(ext2_filsys fs);
-static void fix_dotdot(ext2_filsys fs, struct dir_info *dir, ino_t parent);
-static errcode_t adjust_inode_count(ext2_filsys fs, ino_t ino, int adj);
-static errcode_t expand_directory(ext2_filsys fs, ino_t dir);
+static void check_root(e2fsck_t ctx);
+static int check_directory(e2fsck_t ctx, ext2_ino_t ino,
+			   struct problem_context *pctx);
+static void fix_dotdot(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent);
 
-static ino_t lost_and_found = 0;
-static int bad_lost_and_found = 0;
+static ext2fs_inode_bitmap inode_loop_detect = 0;
+static ext2fs_inode_bitmap inode_done_map = 0;
 
-static ext2fs_inode_bitmap inode_loop_detect;
-static ext2fs_inode_bitmap inode_done_map;
-	
-void pass3(ext2_filsys fs)
+void e2fsck_pass3(e2fsck_t ctx)
 {
-	int		i;
-	errcode_t	retval;
+	ext2_filsys fs = ctx->fs;
+	struct dir_info_iter *iter;
+#ifdef RESOURCE_TRACK
 	struct resource_track	rtrack;
-	
-	init_resource_track(&rtrack);
+#endif
+	struct problem_context	pctx;
+	struct dir_info	*dir;
+	unsigned long maxdirs, count;
+
+#ifdef RESOURCE_TRACK
+	init_resource_track(&rtrack, ctx->fs->io);
+#endif
+
+	clear_problem_context(&pctx);
 
 #ifdef MTRACE
 	mtrace_print("Pass 3");
 #endif
 
-	if (!preen)
-		printf("Pass 3: Checking directory connectivity\n");
+	if (!(ctx->options & E2F_OPT_PREEN))
+		fix_problem(ctx, PR_3_PASS_HEADER, &pctx);
 
 	/*
 	 * Allocate some bitmaps to do loop detection.
 	 */
-	retval = ext2fs_allocate_inode_bitmap(fs,
-					      "inode loop detection bitmap",
-					      &inode_loop_detect);
-	if (retval) {
-		com_err("ext2fs_allocate_inode_bitmap", retval,
-			"while allocating inode_loop_detect");
-		fatal_error(0);
-	}
-	retval = ext2fs_allocate_inode_bitmap(fs, "inode done bitmap",
-					      &inode_done_map);
-	if (retval) {
-		com_err("ext2fs_allocate_inode_bitmap", retval,
-			"while allocating inode_done_map");
-		fatal_error(0);
+	pctx.errcode = ext2fs_allocate_inode_bitmap(fs, _("inode done bitmap"),
+						    &inode_done_map);
+	if (pctx.errcode) {
+		pctx.num = 2;
+		fix_problem(ctx, PR_3_ALLOCATE_IBITMAP_ERROR, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		goto abort_exit;
 	}
-	if (tflag) {
-		printf("Peak memory: ");
-		print_resource_track(&global_rtrack);
+#ifdef RESOURCE_TRACK
+	if (ctx->options & E2F_OPT_TIME) {
+		e2fsck_clear_progbar(ctx);
+		print_resource_track(_("Peak memory"), &ctx->global_rtrack,
+				     NULL);
 	}
+#endif
+
+	check_root(ctx);
+	if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+		goto abort_exit;
 
-	check_root(fs, EXT2_ROOT_INO);
 	ext2fs_mark_inode_bitmap(inode_done_map, EXT2_ROOT_INO);
 
-	for (i=1; i <= fs->super->s_inodes_count; i++) {
-		if (ext2fs_test_inode_bitmap(inode_dir_map, i))
-			check_directory(fs, i);
+	maxdirs = e2fsck_get_num_dirinfo(ctx);
+	count = 1;
+
+	if (ctx->progress)
+		if ((ctx->progress)(ctx, 3, 0, maxdirs))
+			goto abort_exit;
+
+	iter = e2fsck_dir_info_iter_begin(ctx);
+	while ((dir = e2fsck_dir_info_iter(ctx, iter)) != 0) {
+		if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+			goto abort_exit;
+		if (ctx->progress && (ctx->progress)(ctx, 3, count++, maxdirs))
+			goto abort_exit;
+		if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, dir->ino))
+			if (check_directory(ctx, dir->ino, &pctx))
+				goto abort_exit;
 	}
-	
-	free_dir_info(fs);
-	ext2fs_free_inode_bitmap(inode_loop_detect);
-	ext2fs_free_inode_bitmap(inode_done_map);
-	if (tflag > 1) {
-		printf("Pass 3: ");
-		print_resource_track(&rtrack);
+	e2fsck_dir_info_iter_end(ctx, iter);
+
+	/*
+	 * Force the creation of /lost+found if not present
+	 */
+	if ((ctx->flags & E2F_OPT_READONLY) == 0)
+		e2fsck_get_lost_and_found(ctx, 1);
+
+	/*
+	 * If there are any directories that need to be indexed or
+	 * optimized, do it here.
+	 */
+	e2fsck_rehash_directories(ctx);
+
+abort_exit:
+	e2fsck_free_dir_info(ctx);
+	if (inode_loop_detect) {
+		ext2fs_free_inode_bitmap(inode_loop_detect);
+		inode_loop_detect = 0;
 	}
+	if (inode_done_map) {
+		ext2fs_free_inode_bitmap(inode_done_map);
+		inode_done_map = 0;
+	}
+
+#ifdef RESOURCE_TRACK
+	if (ctx->options & E2F_OPT_TIME2) {
+		e2fsck_clear_progbar(ctx);
+		print_resource_track(_("Pass 3"), &rtrack, ctx->fs->io);
+	}
+#endif
 }
 
 /*
  * This makes sure the root inode is present; if not, we ask if the
  * user wants us to create it.  Not creating it is a fatal error.
  */
-void check_root(ext2_filsys fs, ino_t root_ino)
+static void check_root(e2fsck_t ctx)
 {
+	ext2_filsys fs = ctx->fs;
 	blk_t			blk;
-	errcode_t		retval;
 	struct ext2_inode	inode;
 	char *			block;
-	struct dir_info		*dir;
-	
-	if (ext2fs_test_inode_bitmap(inode_used_map, root_ino)) {
+	struct problem_context	pctx;
+
+	clear_problem_context(&pctx);
+
+	if (ext2fs_test_inode_bitmap(ctx->inode_used_map, EXT2_ROOT_INO)) {
 		/*
-		 * If the root inode is a directory, die here.  The
+		 * If the root inode is not a directory, die here.  The
 		 * user must have answered 'no' in pass1 when we
 		 * offered to clear it.
 		 */
-		if (!(ext2fs_test_inode_bitmap(inode_dir_map, root_ino)))
-			fatal_error("Root inode not directory");
-		
-		/*
-		 * Set up the parent pointer for the root; this isn't
-		 * done anywhere else, so we do it here.
-		 */
-		dir = get_dir_info(root_ino);
-		dir->parent = root_ino;
-		
+		if (!(ext2fs_test_inode_bitmap(ctx->inode_dir_map,
+					       EXT2_ROOT_INO))) {
+			fix_problem(ctx, PR_3_ROOT_NOT_DIR_ABORT, &pctx);
+			ctx->flags |= E2F_FLAG_ABORT;
+		}
 		return;
 	}
 
-	printf("Root inode not allocated.  ");
-	preenhalt(fs);
-	if (!ask("Reallocate", 1)) {
-		ext2fs_unmark_valid(fs);
-		fatal_error("Cannot proceed without a root inode.");
+	if (!fix_problem(ctx, PR_3_NO_ROOT_INODE, &pctx)) {
+		fix_problem(ctx, PR_3_NO_ROOT_INODE_ABORT, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		return;
 	}
 
-	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("ext2fs_new_block", retval,
-			"while trying to create root directory");
-		fatal_error(0);
+	pctx.errcode = ext2fs_new_block(fs, 0, ctx->block_found_map, &blk);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_new_block";
+		fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		return;
 	}
-	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
 	 */
-	retval = ext2fs_new_dir_block(fs, EXT2_ROOT_INO, EXT2_ROOT_INO,
-				      &block);
-	if (retval) {
-		com_err("ext2fs_new_dir_block", retval,
-			"while creating new root directory");
-		fatal_error(0);
+	pctx.errcode = ext2fs_new_dir_block(fs, EXT2_ROOT_INO, EXT2_ROOT_INO,
+					    &block);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_new_dir_block";
+		fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		return;
 	}
 
-	retval = ext2fs_write_dir_block(fs, blk, block);
-	if (retval) {
-		com_err("ext2fs_write_dir_block", retval,
-			"while writing the root directory block");
-		fatal_error(0);
+	pctx.errcode = ext2fs_write_dir_block(fs, blk, block);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_write_dir_block";
+		fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		return;
 	}
-	free(block);
+	ext2fs_free_mem(&block);
 
 	/*
 	 * Set up the inode structure
@@ -183,30 +225,31 @@ void check_root(ext2_filsys fs, ino_t root_ino)
 	memset(&inode, 0, sizeof(inode));
 	inode.i_mode = 040755;
 	inode.i_size = fs->blocksize;
-	inode.i_atime = inode.i_ctime = inode.i_mtime = time(0);
+	inode.i_atime = inode.i_ctime = inode.i_mtime = ctx->now;
 	inode.i_links_count = 2;
-	inode.i_blocks = fs->blocksize / 512;
+	ext2fs_iblk_set(fs, &inode, 1);
 	inode.i_block[0] = blk;
 
 	/*
 	 * Write out the inode.
 	 */
-	retval = ext2fs_write_inode(fs, EXT2_ROOT_INO, &inode);
-	if (retval) {
-		com_err("ext2fs_write_inode", retval,
-			"While trying to create /lost+found");
-		fatal_error(0);
+	pctx.errcode = ext2fs_write_new_inode(fs, EXT2_ROOT_INO, &inode);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_write_inode";
+		fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx);
+		ctx->flags |= E2F_FLAG_ABORT;
+		return;
 	}
-	
+
 	/*
 	 * Miscellaneous bookkeeping...
 	 */
-	add_dir_info(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, &inode);
-	inode_count[EXT2_ROOT_INO] = 2;
-	inode_link_info[EXT2_ROOT_INO] = 2;
+	e2fsck_add_dir_info(ctx, EXT2_ROOT_INO, EXT2_ROOT_INO);
+	ext2fs_icount_store(ctx->inode_count, EXT2_ROOT_INO, 2);
+	ext2fs_icount_store(ctx->inode_link_info, EXT2_ROOT_INO, 2);
 
-	ext2fs_mark_inode_bitmap(inode_used_map, EXT2_ROOT_INO);
-	ext2fs_mark_inode_bitmap(inode_dir_map, EXT2_ROOT_INO);
+	ext2fs_mark_inode_bitmap(ctx->inode_used_map, EXT2_ROOT_INO);
+	ext2fs_mark_inode_bitmap(ctx->inode_dir_map, EXT2_ROOT_INO);
 	ext2fs_mark_inode_bitmap(fs->inode_map, EXT2_ROOT_INO);
 	ext2fs_mark_ib_dirty(fs);
 }
@@ -218,187 +261,206 @@ void check_root(ext2_filsys fs, ino_t root_ino)
  * the lost+found.  We have to do loop detection; if we ever discover
  * a loop, we treat that as a disconnected directory and offer to
  * reparent it to lost+found.
+ *
+ * However, loop detection is expensive, because for very large
+ * filesystems, the inode_loop_detect bitmap is huge, and clearing it
+ * is non-trivial.  Loops in filesystems are also a rare error case,
+ * and we shouldn't optimize for error cases.  So we try two passes of
+ * the algorithm.  The first time, we ignore loop detection and merely
+ * increment a counter; if the counter exceeds some extreme threshold,
+ * then we try again with the loop detection bitmap enabled.
  */
-static void check_directory(ext2_filsys fs, ino_t ino)
+static int check_directory(e2fsck_t ctx, ext2_ino_t dir,
+			   struct problem_context *pctx)
 {
-	struct dir_info	*dir;
-	struct dir_info *p;
-	errcode_t	retval;
-	char		*path1, *path2, *path3;
-	static char unknown[] = "???";
-
-	dir = get_dir_info(ino);
-	if (!dir) {
-		printf("Internal error: couldn't find dir_info for %lu\n",
-		       ino);
-		fatal_error(0);
-	}
+	ext2_filsys 	fs = ctx->fs;
+	ext2_ino_t	ino = dir, parent;
+	int		loop_pass = 0, parent_count = 0;
 
-	ext2fs_clear_inode_bitmap(inode_loop_detect);
-	p = dir;
-	while (p) {
-		/*
-		 * If we find a parent which we've already checked,
-		 * then stop; we know it's either already connected to
-		 * the directory tree, or it isn't but the user has
-		 * already told us he doesn't want us to reconnect the
-		 * disconnected subtree.
-		 */
-		if (ext2fs_test_inode_bitmap(inode_done_map, p->ino))
-			goto check_dot_dot;
+	while (1) {
 		/*
 		 * Mark this inode as being "done"; by the time we
 		 * return from this function, the inode we either be
 		 * verified as being connected to the directory tree,
 		 * or we will have offered to reconnect this to
 		 * lost+found.
+		 *
+		 * If it was marked done already, then we've reached a
+		 * parent we've already checked.
 		 */
-		ext2fs_mark_inode_bitmap(inode_done_map, p->ino);
+	  	if (ext2fs_mark_inode_bitmap(inode_done_map, ino))
+			break;
+
+		if (e2fsck_dir_info_get_parent(ctx, ino, &parent)) {
+			fix_problem(ctx, PR_3_NO_DIRINFO, pctx);
+			return 0;
+		}
+
 		/*
 		 * If this directory doesn't have a parent, or we've
 		 * seen the parent once already, then offer to
 		 * reparent it to lost+found
 		 */
-		if (!p->parent ||
-		    (ext2fs_test_inode_bitmap(inode_loop_detect,
-					      p->parent)))
+		if (!parent ||
+		    (loop_pass &&
+		     (ext2fs_test_inode_bitmap(inode_loop_detect,
+					       parent)))) {
+			pctx->ino = ino;
+			if (fix_problem(ctx, PR_3_UNCONNECTED_DIR, pctx)) {
+				if (e2fsck_reconnect_file(ctx, pctx->ino))
+					ext2fs_unmark_valid(fs);
+				else {
+					fix_dotdot(ctx, pctx->ino,
+						   ctx->lost_and_found);
+					parent = ctx->lost_and_found;
+				}
+			}
 			break;
-		ext2fs_mark_inode_bitmap(inode_loop_detect,
-					 p->parent);
-		p = get_dir_info(p->parent);
-	}
-	/*
-	 * If we've reached here, we've hit a detached directory
-	 * inode; offer to reconnect it to lost+found.
-	 */
-	retval = ext2fs_get_pathname(fs, p->ino, 0, &path1);
-	if (retval)
-		path1 = unknown;
-
-	printf("Unconnected directory inode %lu (%s)\n", p->ino, path1);
-	if (path1 != unknown)
-		free(path1);
-	preenhalt(fs);
-	if (ask("Connect to /lost+found", 1)) {
-		if (reconnect_file(fs, p->ino))
-			ext2fs_unmark_valid(fs);
-		else {
-			p->parent = lost_and_found;
-			fix_dotdot(fs, p, lost_and_found);
 		}
-		
-	} else
-		ext2fs_unmark_valid(fs);
+		ino = parent;
+		if (loop_pass) {
+			ext2fs_mark_inode_bitmap(inode_loop_detect, ino);
+		} else if (parent_count++ > 2048) {
+			/*
+			 * If we've run into a path depth that's
+			 * greater than 2048, try again with the inode
+			 * loop bitmap turned on and start from the
+			 * top.
+			 */
+			loop_pass = 1;
+			if (inode_loop_detect)
+				ext2fs_clear_inode_bitmap(inode_loop_detect);
+			else {
+				pctx->errcode = ext2fs_allocate_inode_bitmap(fs, _("inode loop detection bitmap"), &inode_loop_detect);
+				if (pctx->errcode) {
+					pctx->num = 1;
+					fix_problem(ctx,
+				    PR_3_ALLOCATE_IBITMAP_ERROR, pctx);
+					ctx->flags |= E2F_FLAG_ABORT;
+					return -1;
+				}
+			}
+			ino = dir;
+		}
+	}
 
 	/*
 	 * Make sure that .. and the parent directory are the same;
 	 * offer to fix it if not.
 	 */
-check_dot_dot:
-	if (dir->parent != dir->dotdot) {
-		retval = ext2fs_get_pathname(fs, dir->parent, ino,
-					     &path1);
-		if (retval)
-			path1 = unknown;
-		retval = ext2fs_get_pathname(fs, dir->dotdot, 0, &path2);
-		if (retval)
-			path2 = unknown;
-		retval = ext2fs_get_pathname(fs, dir->parent, 0, &path3);
-		if (retval)
-			path3 = unknown;
-		
-		printf("'..' in %s (%lu) is %s (%lu), should be %s (%lu).\n",
-		       path1, ino, path2, dir->dotdot,
-		       path3, dir->parent);
-		if (path1 != unknown)
-			free(path1);
-		if (path2 != unknown)
-			free(path2);
-		if (path3 != unknown)
-			free(path3);
-		if (ask("Fix", 1))
-			fix_dotdot(fs, dir, dir->parent);
-		else
-			ext2fs_unmark_valid(fs);
-	}
-}	
+	pctx->ino = dir;
+	if (e2fsck_dir_info_get_dotdot(ctx, dir, &pctx->ino2) ||
+	    e2fsck_dir_info_get_parent(ctx, dir, &pctx->dir)) {
+		fix_problem(ctx, PR_3_NO_DIRINFO, pctx);
+		return 0;
+	}
+	if (pctx->ino2 != pctx->dir) {
+		if (fix_problem(ctx, PR_3_BAD_DOT_DOT, pctx))
+			fix_dotdot(ctx, dir, pctx->dir);
+	}
+	return 0;
+}
 
 /*
  * This routine gets the lost_and_found inode, making it a directory
  * if necessary
  */
-ino_t get_lost_and_found(ext2_filsys fs)
+ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix)
 {
-	ino_t			ino;
+	ext2_filsys fs = ctx->fs;
+	ext2_ino_t			ino;
 	blk_t			blk;
 	errcode_t		retval;
 	struct ext2_inode	inode;
 	char *			block;
-	const char *		name = "lost+found";
-
-	retval = ext2fs_lookup(fs, EXT2_ROOT_INO, name, strlen(name), 0, &ino);
-	if (!retval)
-		return ino;
-	if (retval != ENOENT)
-		printf("Error while trying to find /lost+found: %s",
-		       error_message(retval));
-	else
-		printf("/lost+found not found.  ");
-	preenhalt(fs);
-	if (!ask("Create", 1)) {
-		ext2fs_unmark_valid(fs);
+	static const char	name[] = "lost+found";
+	struct 	problem_context	pctx;
+
+	if (ctx->lost_and_found)
+		return ctx->lost_and_found;
+
+	clear_problem_context(&pctx);
+
+	retval = ext2fs_lookup(fs, EXT2_ROOT_INO, name,
+			       sizeof(name)-1, 0, &ino);
+	if (retval && !fix)
 		return 0;
+	if (!retval) {
+		if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, ino)) {
+			ctx->lost_and_found = ino;
+			return ino;
+		}
+
+		/* Lost+found isn't a directory! */
+		if (!fix)
+			return 0;
+		pctx.ino = ino;
+		if (!fix_problem(ctx, PR_3_LPF_NOTDIR, &pctx))
+			return 0;
+
+		/* OK, unlink the old /lost+found file. */
+		pctx.errcode = ext2fs_unlink(fs, EXT2_ROOT_INO, name, ino, 0);
+		if (pctx.errcode) {
+			pctx.str = "ext2fs_unlink";
+			fix_problem(ctx, PR_3_CREATE_LPF_ERROR, &pctx);
+			return 0;
+		}
+		(void) e2fsck_dir_info_set_parent(ctx, ino, 0);
+		e2fsck_adjust_inode_count(ctx, ino, -1);
+	} else if (retval != EXT2_ET_FILE_NOT_FOUND) {
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_ERR_FIND_LPF, &pctx);
 	}
+	if (!fix_problem(ctx, PR_3_NO_LF_DIR, 0))
+		return 0;
 
 	/*
 	 * 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);
+	retval = ext2fs_new_block(fs, 0, ctx->block_found_map, &blk);
 	if (retval) {
-		com_err("ext2fs_new_block", retval,
-			"while trying to create /lost+found directory");
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_ERR_LPF_NEW_BLOCK, &pctx);
 		return 0;
 	}
-	ext2fs_mark_block_bitmap(block_found_map, blk);
-	ext2fs_mark_block_bitmap(fs->block_map, blk);
-	ext2fs_mark_bb_dirty(fs);
+	ext2fs_mark_block_bitmap(ctx->block_found_map, blk);
+	ext2fs_block_alloc_stats(fs, blk, +1);
 
 	/*
 	 * Next find a free inode.
 	 */
-	retval = ext2fs_new_inode(fs, EXT2_ROOT_INO, 040755, inode_used_map,
-				  &ino);
+	retval = ext2fs_new_inode(fs, EXT2_ROOT_INO, 040700,
+				  ctx->inode_used_map, &ino);
 	if (retval) {
-		com_err("ext2fs_new_inode", retval,
-			"while trying to create /lost+found directory");
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_ERR_LPF_NEW_INODE, &pctx);
 		return 0;
 	}
-	ext2fs_mark_inode_bitmap(inode_used_map, ino);
-	ext2fs_mark_inode_bitmap(inode_dir_map, ino);
-	ext2fs_mark_inode_bitmap(fs->inode_map, ino);
-	ext2fs_mark_ib_dirty(fs);
+	ext2fs_mark_inode_bitmap(ctx->inode_used_map, ino);
+	ext2fs_mark_inode_bitmap(ctx->inode_dir_map, ino);
+	ext2fs_inode_alloc_stats2(fs, ino, +1, 1);
 
 	/*
 	 * Now let's create the actual data block for the inode
 	 */
 	retval = ext2fs_new_dir_block(fs, ino, EXT2_ROOT_INO, &block);
 	if (retval) {
-		com_err("ext2fs_new_dir_block", retval,
-			"while creating new directory block");
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_ERR_LPF_NEW_DIR_BLOCK, &pctx);
 		return 0;
 	}
 
 	retval = ext2fs_write_dir_block(fs, blk, block);
-	free(block);
+	ext2fs_free_mem(&block);
 	if (retval) {
-		com_err("ext2fs_write_dir_block", retval,
-			"while writing the directory block for /lost+found");
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_ERR_LPF_WRITE_BLOCK, &pctx);
 		return 0;
 	}
 
@@ -406,38 +468,40 @@ ino_t get_lost_and_found(ext2_filsys fs)
 	 * Set up the inode structure
 	 */
 	memset(&inode, 0, sizeof(inode));
-	inode.i_mode = 040755;
+	inode.i_mode = 040700;
 	inode.i_size = fs->blocksize;
-	inode.i_atime = inode.i_ctime = inode.i_mtime = time(0);
+	inode.i_atime = inode.i_ctime = inode.i_mtime = ctx->now;
 	inode.i_links_count = 2;
-	inode.i_blocks = fs->blocksize / 512;
+	ext2fs_iblk_set(fs, &inode, 1);
 	inode.i_block[0] = blk;
 
 	/*
 	 * Next, write out the inode.
 	 */
-	retval = ext2fs_write_inode(fs, ino, &inode);
-	if (retval) {
-		com_err("ext2fs_write_inode", retval,
-			"While trying to create /lost+found");
+	pctx.errcode = ext2fs_write_new_inode(fs, ino, &inode);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_write_inode";
+		fix_problem(ctx, PR_3_CREATE_LPF_ERROR, &pctx);
 		return 0;
 	}
 	/*
 	 * Finally, create the directory link
 	 */
-	retval = ext2fs_link(fs, EXT2_ROOT_INO, name, ino, 0);
-	if (retval) {
-		com_err("ext2fs_link", retval, "While creating /lost+found");
+	pctx.errcode = ext2fs_link(fs, EXT2_ROOT_INO, name, ino, EXT2_FT_DIR);
+	if (pctx.errcode) {
+		pctx.str = "ext2fs_link";
+		fix_problem(ctx, PR_3_CREATE_LPF_ERROR, &pctx);
 		return 0;
 	}
 
 	/*
 	 * Miscellaneous bookkeeping that needs to be kept straight.
 	 */
-	add_dir_info(fs, ino, EXT2_ROOT_INO, &inode);
-	adjust_inode_count(fs, EXT2_ROOT_INO, +1);
-	inode_count[ino] = 2;
-	inode_link_info[ino] = 2;
+	e2fsck_add_dir_info(ctx, ino, EXT2_ROOT_INO);
+	e2fsck_adjust_inode_count(ctx, EXT2_ROOT_INO, 1);
+	ext2fs_icount_store(ctx->inode_count, ino, 2);
+	ext2fs_icount_store(ctx->inode_link_info, ino, 2);
+	ctx->lost_and_found = ino;
 #if 0
 	printf("/lost+found created; inode #%lu\n", ino);
 #endif
@@ -447,44 +511,50 @@ ino_t get_lost_and_found(ext2_filsys fs)
 /*
  * This routine will connect a file to lost+found
  */
-int reconnect_file(ext2_filsys fs, ino_t inode)
+int e2fsck_reconnect_file(e2fsck_t ctx, ext2_ino_t ino)
 {
+	ext2_filsys fs = ctx->fs;
 	errcode_t	retval;
 	char		name[80];
-	
-	if (bad_lost_and_found) {
-		printf("Bad or nonexistent /lost+found.  Cannot reconnect.\n");
-		return 1;
+	struct problem_context	pctx;
+	struct ext2_inode 	inode;
+	int		file_type = 0;
+
+	clear_problem_context(&pctx);
+	pctx.ino = ino;
+
+	if (!ctx->bad_lost_and_found && !ctx->lost_and_found) {
+		if (e2fsck_get_lost_and_found(ctx, 1) == 0)
+			ctx->bad_lost_and_found++;
 	}
-	if (!lost_and_found) {
-		lost_and_found = get_lost_and_found(fs);
-		if (!lost_and_found) {
-			printf("Bad or nonexistent /lost+found.  Cannot reconnect.\n");
-			bad_lost_and_found++;
-			return 1;
-		}
+	if (ctx->bad_lost_and_found) {
+		fix_problem(ctx, PR_3_NO_LPF, &pctx);
+		return 1;
 	}
 
-	sprintf(name, "#%lu", inode);
-	retval = ext2fs_link(fs, lost_and_found, name, inode, 0);
+	sprintf(name, "#%u", ino);
+	if (ext2fs_read_inode(fs, ino, &inode) == 0)
+		file_type = ext2_file_type(inode.i_mode);
+	retval = ext2fs_link(fs, ctx->lost_and_found, name, ino, file_type);
 	if (retval == EXT2_ET_DIR_NO_SPACE) {
-		if (!ask("No room in /lost+found; expand /lost+found", 1))
+		if (!fix_problem(ctx, PR_3_EXPAND_LF_DIR, &pctx))
 			return 1;
-		retval = expand_directory(fs, lost_and_found);
+		retval = e2fsck_expand_directory(ctx, ctx->lost_and_found,
+						 1, 0);
 		if (retval) {
-			printf("Could not expand /lost+found: %s\n",
-			       error_message(retval));
+			pctx.errcode = retval;
+			fix_problem(ctx, PR_3_CANT_EXPAND_LPF, &pctx);
 			return 1;
 		}
-		retval = ext2fs_link(fs, lost_and_found, name, inode, 0);
+		retval = ext2fs_link(fs, ctx->lost_and_found, name,
+				     ino, file_type);
 	}
 	if (retval) {
-		printf("Could not reconnect %lu: %s\n", inode,
-		       error_message(retval));
+		pctx.errcode = retval;
+		fix_problem(ctx, PR_3_CANT_RECONNECT, &pctx);
 		return 1;
 	}
-
-	adjust_inode_count(fs, inode, +1);
+	e2fsck_adjust_inode_count(ctx, ino, 1);
 
 	return 0;
 }
@@ -492,11 +562,12 @@ int reconnect_file(ext2_filsys fs, ino_t inode)
 /*
  * Utility routine to adjust the inode counts on an inode.
  */
-static errcode_t adjust_inode_count(ext2_filsys fs, ino_t ino, int adj)
+errcode_t e2fsck_adjust_inode_count(e2fsck_t ctx, ext2_ino_t ino, int adj)
 {
+	ext2_filsys fs = ctx->fs;
 	errcode_t		retval;
 	struct ext2_inode 	inode;
-	
+
 	if (!ino)
 		return 0;
 
@@ -509,9 +580,19 @@ static errcode_t adjust_inode_count(ext2_filsys fs, ino_t ino, int adj)
 	       inode.i_links_count);
 #endif
 
-	inode.i_links_count += adj;
-	inode_count[ino] += adj;
-	inode_link_info[ino] += adj;
+	if (adj == 1) {
+		ext2fs_icount_increment(ctx->inode_count, ino, 0);
+		if (inode.i_links_count == (__u16) ~0)
+			return 0;
+		ext2fs_icount_increment(ctx->inode_link_info, ino, 0);
+		inode.i_links_count++;
+	} else if (adj == -1) {
+		ext2fs_icount_decrement(ctx->inode_count, ino, 0);
+		if (inode.i_links_count == 0)
+			return 0;
+		ext2fs_icount_decrement(ctx->inode_link_info, ino, 0);
+		inode.i_links_count--;
+	}
 
 	retval = ext2fs_write_inode(fs, ino, &inode);
 	if (retval)
@@ -525,62 +606,80 @@ static errcode_t adjust_inode_count(ext2_filsys fs, ino_t ino, int adj)
  */
 struct fix_dotdot_struct {
 	ext2_filsys	fs;
-	ino_t		parent;
+	ext2_ino_t	parent;
 	int		done;
+	e2fsck_t	ctx;
 };
 
 static int fix_dotdot_proc(struct ext2_dir_entry *dirent,
-			   int	offset,
-			   int	blocksize,
-			   char	*buf,
-			   void	*private)
+			   int	offset EXT2FS_ATTR((unused)),
+			   int	blocksize EXT2FS_ATTR((unused)),
+			   char	*buf EXT2FS_ATTR((unused)),
+			   void	*priv_data)
 {
-	struct fix_dotdot_struct *fp = (struct fix_dotdot_struct *) private;
+	struct fix_dotdot_struct *fp = (struct fix_dotdot_struct *) priv_data;
 	errcode_t	retval;
+	struct problem_context pctx;
 
-	if (dirent->name_len != 2)
+	if ((dirent->name_len & 0xFF) != 2)
 		return 0;
 	if (strncmp(dirent->name, "..", 2))
 		return 0;
-	
-	retval = adjust_inode_count(fp->fs, dirent->inode, -1);
-	if (retval)
-		printf("Error while adjusting inode count on inode %u\n",
-		       dirent->inode);
-	retval = adjust_inode_count(fp->fs, fp->parent, 1);
-	if (retval)
-		printf("Error while adjusting inode count on inode %lu\n",
-		       fp->parent);
 
+	clear_problem_context(&pctx);
+
+	retval = e2fsck_adjust_inode_count(fp->ctx, dirent->inode, -1);
+	if (retval) {
+		pctx.errcode = retval;
+		fix_problem(fp->ctx, PR_3_ADJUST_INODE, &pctx);
+	}
+	retval = e2fsck_adjust_inode_count(fp->ctx, fp->parent, 1);
+	if (retval) {
+		pctx.errcode = retval;
+		fix_problem(fp->ctx, PR_3_ADJUST_INODE, &pctx);
+	}
 	dirent->inode = fp->parent;
+	if (fp->ctx->fs->super->s_feature_incompat &
+	    EXT2_FEATURE_INCOMPAT_FILETYPE)
+		dirent->name_len = (dirent->name_len & 0xFF) |
+			(EXT2_FT_DIR << 8);
+	else
+		dirent->name_len = dirent->name_len & 0xFF;
 
 	fp->done++;
 	return DIRENT_ABORT | DIRENT_CHANGED;
 }
 
-static void fix_dotdot(ext2_filsys fs, struct dir_info *dir, ino_t parent)
+static void fix_dotdot(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent)
 {
+	ext2_filsys fs = ctx->fs;
 	errcode_t	retval;
 	struct fix_dotdot_struct fp;
+	struct problem_context pctx;
 
 	fp.fs = fs;
 	fp.parent = parent;
 	fp.done = 0;
+	fp.ctx = ctx;
 
 #if 0
-	printf("Fixing '..' of inode %lu to be %lu...\n", dir->ino, parent);
+	printf("Fixing '..' of inode %lu to be %lu...\n", ino, parent);
 #endif
-	
-	retval = ext2fs_dir_iterate(fs, dir->ino, DIRENT_FLAG_INCLUDE_EMPTY,
+
+	clear_problem_context(&pctx);
+	pctx.ino = ino;
+	retval = ext2fs_dir_iterate(fs, ino, DIRENT_FLAG_INCLUDE_EMPTY,
 				    0, fix_dotdot_proc, &fp);
 	if (retval || !fp.done) {
-		printf("Couldn't fix parent of inode %lu: %s\n\n",
-		       dir->ino, retval ? error_message(retval) :
-		       "Couldn't find parent direntory entry");
+		pctx.errcode = retval;
+		fix_problem(ctx, retval ? PR_3_FIX_PARENT_ERR :
+			    PR_3_FIX_PARENT_NOFIND, &pctx);
 		ext2fs_unmark_valid(fs);
 	}
-	dir->dotdot = parent;
-	
+	(void) e2fsck_dir_info_set_dotdot(ctx, ino, parent);
+	if (e2fsck_dir_info_set_parent(ctx, ino, ctx->lost_and_found))
+		fix_problem(ctx, PR_3_NO_DIRINFO, &pctx);
+
 	return;
 }
 
@@ -590,26 +689,41 @@ static void fix_dotdot(ext2_filsys fs, struct dir_info *dir, ino_t parent)
  */
 
 struct expand_dir_struct {
-	int	done;
-	errcode_t	err;
+	int			num;
+	int			guaranteed_size;
+	int			newblocks;
+	int			last_block;
+	errcode_t		err;
+	e2fsck_t		ctx;
 };
 
 static int expand_dir_proc(ext2_filsys fs,
 			   blk_t	*blocknr,
-			   int	blockcnt,
-			   void	*private)
+			   e2_blkcnt_t	blockcnt,
+			   blk_t ref_block EXT2FS_ATTR((unused)),
+			   int ref_offset EXT2FS_ATTR((unused)),
+			   void	*priv_data)
 {
-	struct expand_dir_struct *es = (struct expand_dir_struct *) private;
+	struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data;
 	blk_t	new_blk;
 	static blk_t	last_blk = 0;
 	char		*block;
 	errcode_t	retval;
-	
+	e2fsck_t	ctx;
+
+	ctx = es->ctx;
+
+	if (es->guaranteed_size && blockcnt >= es->guaranteed_size)
+		return BLOCK_ABORT;
+
+	if (blockcnt > 0)
+		es->last_block = blockcnt;
 	if (*blocknr) {
 		last_blk = *blocknr;
 		return 0;
 	}
-	retval = ext2fs_new_block(fs, last_blk, block_found_map, &new_blk);
+	retval = ext2fs_new_block(fs, last_blk, ctx->block_found_map,
+				  &new_blk);
 	if (retval) {
 		es->err = retval;
 		return BLOCK_ABORT;
@@ -620,54 +734,66 @@ static int expand_dir_proc(ext2_filsys fs,
 			es->err = retval;
 			return BLOCK_ABORT;
 		}
-		es->done = 1;
+		es->num--;
+		retval = ext2fs_write_dir_block(fs, new_blk, block);
 	} else {
-		block = malloc(fs->blocksize);
-		if (!block) {
-			es->err = ENOMEM;
+		retval = ext2fs_get_mem(fs->blocksize, &block);
+		if (retval) {
+			es->err = retval;
 			return BLOCK_ABORT;
 		}
 		memset(block, 0, fs->blocksize);
-	}	
-	retval = ext2fs_write_dir_block(fs, new_blk, block);
+		retval = io_channel_write_blk(fs->io, new_blk, 1, block);
+	}
 	if (retval) {
 		es->err = retval;
 		return BLOCK_ABORT;
 	}
-	free(block);
+	ext2fs_free_mem(&block);
 	*blocknr = new_blk;
-	ext2fs_mark_block_bitmap(block_found_map, new_blk);
-	ext2fs_mark_block_bitmap(fs->block_map, new_blk);
-	ext2fs_mark_bb_dirty(fs);
-	if (es->done)
+	ext2fs_mark_block_bitmap(ctx->block_found_map, new_blk);
+	ext2fs_block_alloc_stats(fs, new_blk, +1);
+	es->newblocks++;
+
+	if (es->num == 0)
 		return (BLOCK_CHANGED | BLOCK_ABORT);
 	else
 		return BLOCK_CHANGED;
 }
 
-static errcode_t expand_directory(ext2_filsys fs, ino_t dir)
+errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir,
+				  int num, int guaranteed_size)
 {
+	ext2_filsys fs = ctx->fs;
 	errcode_t	retval;
 	struct expand_dir_struct es;
 	struct ext2_inode	inode;
-	
+
 	if (!(fs->flags & EXT2_FLAG_RW))
 		return EXT2_ET_RO_FILSYS;
 
+	/*
+	 * Read the inode and block bitmaps in; we'll be messing with
+	 * them.
+	 */
+	e2fsck_read_bitmaps(ctx);
+
 	retval = ext2fs_check_directory(fs, dir);
 	if (retval)
 		return retval;
-	
-	es.done = 0;
+
+	es.num = num;
+	es.guaranteed_size = guaranteed_size;
+	es.last_block = 0;
 	es.err = 0;
-	
-	retval = ext2fs_block_iterate(fs, dir, BLOCK_FLAG_APPEND,
-				      0, expand_dir_proc, &es);
+	es.newblocks = 0;
+	es.ctx = ctx;
+
+	retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND,
+				       0, expand_dir_proc, &es);
 
 	if (es.err)
 		return es.err;
-	if (!es.done)
-		return EXT2_ET_EXPAND_DIR_ERR;
 
 	/*
 	 * Update the size and block count fields in the inode.
@@ -675,14 +801,12 @@ static errcode_t expand_directory(ext2_filsys fs, ino_t dir)
 	retval = ext2fs_read_inode(fs, dir, &inode);
 	if (retval)
 		return retval;
-	
-	inode.i_size += fs->blocksize;
-	inode.i_blocks += fs->blocksize / 512;
 
-	e2fsck_write_inode(fs, dir, &inode, "expand_directory");
+	inode.i_size = (es.last_block + 1) * fs->blocksize;
+	ext2fs_iblk_add_blocks(fs, &inode, es.newblocks);
+
+	e2fsck_write_inode(ctx, dir, &inode, "expand_directory");
 
 	return 0;
 }
 
-
-