--- linux.ori/fs/reiserfs/journal.c Mon Aug 25 13:44:43 2003 +++ linux/fs/reiserfs/journal.c Wed Mar 3 13:26:23 2004 @@ -2094,7 +2094,7 @@ /* make sure that journal matches to the super block */ if (is_reiserfs_jr(rs) && - jh->jh_journal.jp_journal_magic != sb_jp_journal_magic(rs)) { + le32_to_cpu (jh->jh_journal.jp_journal_magic) != sb_jp_journal_magic(rs)) { char jname[ 32 ]; char fname[ 32 ]; @@ -2102,7 +2102,7 @@ strcpy( fname, kdevname( p_s_sb->s_dev ) ); printk("journal-460: journal header magic %x (device %s) does not " "match magic found in super block %x (device %s)\n", - jh->jh_journal.jp_journal_magic, jname, + le32_to_cpu (jh->jh_journal.jp_journal_magic), jname, sb_jp_journal_magic(rs), fname); brelse (bhjh); goto free_and_return; --- linux.ori/include/linux/reiserfs_fs.h Mon Aug 25 13:44:44 2003 +++ linux/include/linux/reiserfs_fs.h Wed Mar 3 13:25:45 2004 @@ -219,7 +219,7 @@ #define SB_ONDISK_JOURNAL_DEVICE(s) \ le32_to_cpu ((SB_ONDISK_JP(s)->jp_journal_dev)) #define SB_ONDISK_RESERVED_FOR_JOURNAL(s) \ - le32_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)->s_reserved_for_journal)) + le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)->s_reserved_for_journal)) #define is_block_in_log_or_reserved_area(s, block) \ block >= SB_JOURNAL_1st_RESERVED_BLOCK(s) \