Re: Change in fsys_reiserfs.c

[OKUJI Yoshinori]

  Gordon, please apply this:

Index: ChangeLog
===================================================================
RCS file: /home/cvs/grub/ChangeLog,v
retrieving revision 1.326
diff -u -r1.326 ChangeLog
--- ChangeLog   2000/09/30 17:56:29     1.326
+++ ChangeLog   2000/10/04 12:44:20
@@ -1,3 +1,10 @@
+2000-10-04  OKUJI Yoshinori  <address@hidden>
+
+       * stage2/fsys_reiserfs.c (reiserfs_mount): Compare PART_LENGTH
+       with SUPERBLOCK + (sizeof(super) >> SECTOR_BITS) instead of
+       sizeof(struct reiserfs_super_block). Reported by Jochen
+       Hoenicke.
+       
 2000-10-01  OKUJI Yoshinori  <address@hidden>
 
        * lib/device.c [__linux__]: Don't include <linux/cdrom.h>.
Index: stage2/fsys_reiserfs.c
===================================================================
RCS file: /home/cvs/grub/stage2/fsys_reiserfs.c,v
retrieving revision 1.7
diff -u -r1.7 fsys_reiserfs.c
--- stage2/fsys_reiserfs.c      2000/09/29 18:55:27     1.7
+++ stage2/fsys_reiserfs.c      2000/10/04 12:44:20
@@ -560,7 +560,7 @@
   struct reiserfs_super_block super;
   int superblock = REISERFS_DISK_OFFSET_IN_BYTES >> SECTOR_BITS;
 
-  if (part_length < sizeof (struct reiserfs_super_block)
+  if (part_length < superblock + (sizeof (super) >> SECTOR_BITS)
       || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), 
                (char *) &super)
       || (substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
@@ -571,7 +571,7 @@
     {
       /* Try old super block position */
       superblock = REISERFS_OLD_DISK_OFFSET_IN_BYTES >> SECTOR_BITS;
-      if (part_length < sizeof (struct reiserfs_super_block)
+      if (part_length < superblock + (sizeof (super) >> SECTOR_BITS)
          || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), 
                        (char *) &super))
        return 0;