vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify the AFFS checksum computation.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-31 15:22:36 +01:00
parent abafac997c
commit b9cd13659c
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
grub-core/fs/affs.c
View file

@ -174,7 +174,6 @@ grub_affs_mount (grub_disk_t disk)
struct grub_affs_rblock *rblock; struct grub_affs_rblock *rblock;
int checksum = 0; int checksum = 0;
int checksumr = 0;
int blocksize = 0; int blocksize = 0;
data = grub_malloc (sizeof (struct grub_affs_data)); data = grub_malloc (sizeof (struct grub_affs_data));
@ -224,8 +223,6 @@ grub_affs_mount (grub_disk_t disk)
/* The filesystem blocksize is not stored anywhere in the filesystem /* The filesystem blocksize is not stored anywhere in the filesystem
itself. One way to determine it is reading blocks for the itself. One way to determine it is reading blocks for the
rootblock until the checksum is correct. */ rootblock until the checksum is correct. */
checksumr = grub_be_to_cpu32 (rblock->checksum);
rblock->checksum = 0;
for (blocksize = 0; blocksize < 8; blocksize++) for (blocksize = 0; blocksize < 8; blocksize++)
{ {
grub_uint32_t *currblock = rootblock + GRUB_DISK_SECTOR_SIZE * blocksize; grub_uint32_t *currblock = rootblock + GRUB_DISK_SECTOR_SIZE * blocksize;
@ -234,10 +231,10 @@ grub_affs_mount (grub_disk_t disk)
for (i = 0; i < GRUB_DISK_SECTOR_SIZE / sizeof (*currblock); i++) for (i = 0; i < GRUB_DISK_SECTOR_SIZE / sizeof (*currblock); i++)
checksum += grub_be_to_cpu32 (currblock[i]); checksum += grub_be_to_cpu32 (currblock[i]);
if (checksumr == -checksum) if (checksum == 0)
break; break;
} }
if (-checksum != checksumr) if (checksum != 0)
{ {
grub_error (GRUB_ERR_BAD_FS, "AFFS blocksize couldn't be determined"); grub_error (GRUB_ERR_BAD_FS, "AFFS blocksize couldn't be determined");
goto fail; goto fail;