* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb): Use device size from

first superblock to find the second one when possible.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-25 15:09:00 +01:00
parent 9e88df393a
commit ff4479581d
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2012-01-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb): Use device size from
first superblock to find the second one when possible.
2012-01-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-01-25 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Fix an ARC bug. * util/grub-install.in: Fix an ARC bug.

View file

@ -734,6 +734,10 @@ grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
/* Make sure if 1st super block is valid. */ /* Make sure if 1st super block is valid. */
valid[0] = grub_nilfs2_valid_sb (&data->sblock); valid[0] = grub_nilfs2_valid_sb (&data->sblock);
if (valid[0])
partition_size = (grub_le_to_cpu64 (data->sblock.s_dev_size)
>> GRUB_DISK_SECTOR_BITS);
else
partition_size = grub_disk_get_size (disk); partition_size = grub_disk_get_size (disk);
if (partition_size != GRUB_DISK_SIZE_UNKNOWN) if (partition_size != GRUB_DISK_SIZE_UNKNOWN)
{ {