Properly deal with inodes excluded from incremental dump

[dump.git] / restore / restore.c

diff --git a/restore/restore.c b/restore/restore.c
index c87b532d39cfc9046650febb5195e17400a2b4ef..780fd76f04bdd0a3d61297acf9719c0295a6a805 100644 (file)
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: restore.c,v 1.38 2008/04/17 15:22:56 stelian Exp $";
+       "$Id: restore.c,v 1.39 2010/03/22 16:08:10 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -566,6 +566,9 @@ keyval(int key)
 
 /*
  * Find unreferenced link names.
 
 /*
  * Find unreferenced link names.

+ *
+ * This also takes care of directories which were missed by removeoldleaves(),
+ * because their inode has been reused, but excluded from the dump.

  */
 void
 findunreflinks(void)
  */
 void
 findunreflinks(void)


@@ -583,12 +586,19 @@ findunreflinks(void)
                        continue;
                for (j = 0; j < dirhash_size; j++) {
                        for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {
                        continue;
                for (j = 0; j < dirhash_size; j++) {
                        for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {

-                               if (np->e_flags == 0) {
+                               if ((np->e_flags & ~TMPNAME) == 0) {

                                        Dprintf(stdout,
                                            "%s: remove unreferenced name\n",
                                            myname(np));
                                        Dprintf(stdout,
                                            "%s: remove unreferenced name\n",
                                            myname(np));

-                                       removeleaf(np);
-                                       freeentry(np);
+                                       if (np->e_type == LEAF) {
+                                               removeleaf(np);
+                                               freeentry(np);
+                                       } else {
+                                               np->e_flags |= TMPNAME;
+                                               deleteino(np->e_ino);
+                                               np->e_next = removelist;
+                                               removelist = np;
+                                       }

                                }
                        }
                }
                                }
                        }
                }


@@ -609,6 +619,17 @@ findunreflinks(void)
                                            myname(np));
                                        removeleaf(np);
                                        freeentry(np);
                                            myname(np));
                                        removeleaf(np);
                                        freeentry(np);

+                               } else {
+                                       if ((np->e_flags & ~TMPNAME) != 0)
+                                               badentry(np, "unreferenced with flags");
+
+                                       if (np->e_flags == 0) {
+                                               Dprintf(stdout,
+                                                   "%s: remove unreferenced name\n",
+                                                   myname(np));
+                                               np->e_next = ep->e_next;
+                                               ep->e_next = np;
+                                       }

                                }
                        }
                }
                                }
                        }
                }