e2fsck: no parent lookup in disconnected dir

[tools/e2fsprogs.git] / e2fsck / pass3.c

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index cedaaf5..d6b8c8b 100644 (file)
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -22,7 +22,7 @@
  * will offer to reconnect it to /lost+found.  While it is chasing
  * parent pointers up the filesystem tree, if pass3 sees a directory
  * twice, then it has detected a filesystem loop, and it will again
- * offer to reconnect the directory to /lost+found in to break the
+ * offer to reconnect the directory to /lost+found in order to break the
  * filesystem loop.
  *
  * Pass 3 also contains the subroutine, e2fsck_reconnect_file() to
@@ -304,7 +304,7 @@ static int check_directory(e2fsck_t ctx, ext2_ino_t dir,
                 * If it was marked done already, then we've reached a
                 * parent we've already checked.
                 */
-               if (ext2fs_mark_inode_bitmap2(inode_done_map, ino))
+               if (ext2fs_mark_inode_bitmap2(inode_done_map, ino))
                        break;
 
                if (e2fsck_dir_info_get_parent(ctx, ino, &parent)) {
@@ -319,13 +319,18 @@ static int check_directory(e2fsck_t ctx, ext2_ino_t dir,
                 */
                if (!parent ||
                    (loop_pass &&
-                    (ext2fs_test_inode_bitmap2(inode_loop_detect,
-                                              parent)))) {
+                    ext2fs_test_inode_bitmap2(inode_loop_detect, parent))) {
                        pctx->ino = ino;
-                       if (fix_problem(ctx, PR_3_UNCONNECTED_DIR, pctx)) {
-                               if (e2fsck_reconnect_file(ctx, pctx->ino))
+                       if (parent)
+                               pctx->dir = parent;
+                       else
+                               ext2fs_lookup(fs, ino, "..", 2, NULL,
+                                             &pctx->dir);
+                       if (fix_problem(ctx, !parent ? PR_3_UNCONNECTED_DIR :
+                                                      PR_3_LOOPED_DIR, pctx)) {
+                               if (e2fsck_reconnect_file(ctx, pctx->ino)) {
                                        ext2fs_unmark_valid(fs);
-                               else {
+                               } else {
                                        fix_dotdot(ctx, pctx->ino,
                                                   ctx->lost_and_found);
                                        parent = ctx->lost_and_found;