journal.c: fix an endianness bug.

f_badorphan: revert previous, erroneous change.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index e177207..466ab46 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30 Gabriel Paubert <paubert@iram.es>
+
+       * journal.c (e2fsck_journal_load): Fix an endianness bug.
+
+
 2001-11-26  Theodore Tso  <tytso@valinux.com>
 
        * super.c (check_super_block): Make sure that if the inode table

diff --git a/e2fsck/journal.c b/e2fsck/journal.c
index 78f2f1a..89b73ff 100644 (file)
--- a/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@ -402,7 +402,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal)
                
        case JFS_SUPERBLOCK_V2:
                journal->j_format_version = 2;
-               if (jsb->s_nr_users > 1 &&
+               if (ntohl(jsb->s_nr_users) > 1 &&
                    (ctx->fs->io == ctx->journal_io))
                        clear_v2_journal_fields(journal);
                if (ntohl(jsb->s_nr_users) > 1) {

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3e48df6..c5e3ea4 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-30  Gabriel Paubert <paubert@iram.es>
+
+       * f_badorphan: Revert previous, erroneous change.
+
 2001-11-30  Theodore Tso  <tytso@valinux.com>
 
        * f_badorphan, f_journal: Update expect files to reflect the fact

diff --git a/tests/f_badorphan/expect.1 b/tests/f_badorphan/expect.1
index 54bcbfc..a58967a 100644 (file)
--- a/tests/f_badorphan/expect.1
+++ b/tests/f_badorphan/expect.1
@@ -1,6 +1,3 @@
-Found invalid V2 journal superblock fields (from V1 journal).
-Clearing fields beyond the V1 journal superblock...
-
 Clearing orphaned inode 54 (uid=0, gid=0, mode=0100600, size=44610)
 Clearing orphaned inode 32 (uid=0, gid=0, mode=040700, size=1024)
 Clearing orphaned inode 67 (uid=0, gid=0, mode=040700, size=1024)