e2fsck.h (E2F_FLAG_RESTARTED): Assign a unique flag bitfield to

	E2F_FLAG_RESTARTED.  This fixes a bug where if the user
	specifies an alternate superblock, and the journal needs
	to be replayed, e2fsck would erroneously assume that
	journal had been run already without clearing the
	NEEDS_RECOVERY flag, and bomb out with an error.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 4b92c1bd4ced7526544df6033aad73ec80a3f0c3..b30d4c2d22bb7e31316128b9e3b9265e8aeb12ba 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-10  Theodore Ts'o  <tytso@mit.edu>
+
+       * e2fsck.h (E2F_FLAG_RESTARTED): Assign a unique flag bitfield to
+               E2F_FLAG_RESTARTED.  This fixes a bug where if the user
+               specifies an alternate superblock, and the journal needs
+               to be replayed, e2fsck would erroneously assume that
+               journal had been run already without clearing the
+               NEEDS_RECOVERY flag, and bomb out with an error.
+
 2003-12-07  Theodore Ts'o  <tytso@mit.edu>
 
        * badblocks.c, dict.c, ea_refcount.c, ehandler.c, journal.c,

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 695f463b593b118b676dad52d41f2292b6bfff34..ad277453a3674e544c5a7e94c8ad32cf78b47941 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -162,7 +162,7 @@ struct resource_track {
 #define E2F_FLAG_JOURNAL_INODE 0x0080 /* Create a new ext3 journal inode */
 #define E2F_FLAG_SB_SPECIFIED  0x0100 /* The superblock was explicitly 
                                        * specified by the user */
-#define E2F_FLAG_RESTARTED     0x0100 /* E2fsck has been restarted */
+#define E2F_FLAG_RESTARTED     0x0200 /* E2fsck has been restarted */
 
 /*
  * Defines for indicating the e2fsck pass number