Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-02-18 Yoshinori K. Okuji <okuji@enbug.org>

Browse Source 
From Yury V. Umanets <umka@namesys.com>:
	* stage2/fsys_reiserfs.c (REISER3FS_SUPER_MAGIC_STRING): New
	macro.
	(reiserfs_mount): Added checks for ReiserFS 3.
	(reiserfs_embed): Likewise.

2004-01-25  Yoshinori K. Okuji  <okuji@enbug.org>

	* docs/grub.texi (Obtaining and Building GRUB): Instead of
	describing how to use the anoncvs method, specify the URL of
	the description page on Savannah.
	Reported by Bernhard Treutwein.
This commit is contained in:
okuji committed 2004-02-18 22:10:00 +00:00
1 parent 36caa9beb0
commit 54566a13ae
7 files changed
+28 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

stage2/fsys_reiserfs.c
+7 -3
View File
@@ -77,6 +77,7 @@ struct reiserfs_super_block
#define REISERFS_MAX_SUPPORTED_VERSION 2
#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER3FS_SUPER_MAGIC_STRING "ReIsEr3Fs"
#define MAX_HEIGHT 7
@@ -573,7 +574,8 @@ reiserfs_mount (void)
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
|| (substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) > 0
&& substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
&& substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0)
|| (/* check that this is not a copy inside the journal log */
super.s_journal_block * super.s_blocksize
@@ -586,7 +588,8 @@ reiserfs_mount (void)
(char *) &super))
return 0;
if (substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
if (substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) > 0
&& substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
&& substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0)
{
/* pre journaling super block ? */
@@ -1220,7 +1223,8 @@ reiserfs_embed (int *start_sector, int needed_sectors)
*start_sector = 1; /* reserve first sector for stage1 */
if ((substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) <= 0
|| substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) <= 0)
|| substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) <= 0
|| substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) <= 0)
&& (/* check that this is not a super block copy inside
* the journal log */
super.s_journal_block * super.s_blocksize