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

Small restructuring of squash_read

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-09 19:40:11 +01:00
parent 76e39dc871
commit e4eaf62555
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/fs/squash4.c
View file

@ -402,13 +402,12 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len)
grub_uint64_t a; grub_uint64_t a;
struct grub_squash_data *data = file->data; struct grub_squash_data *data = file->data;
a = grub_le_to_cpu32 (data->ino.offset) + file->offset;
if (grub_le_to_cpu16 (data->ino.fragment) == 0xffff) if (grub_le_to_cpu16 (data->ino.fragment) == 0xffff)
{ {
if (grub_le_to_cpu32 (data->ino.chunk)) if (grub_le_to_cpu32 (data->ino.chunk))
a += grub_le_to_cpu32 (data->ino.chunk); a = grub_le_to_cpu32 (data->ino.chunk);
else else
a += sizeof (struct grub_squash_super); a = sizeof (struct grub_squash_super);
} }
else else
{ {
@ -418,10 +417,11 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len)
* grub_le_to_cpu16 (data->ino.fragment)); * grub_le_to_cpu16 (data->ino.fragment));
if (err) if (err)
return -1; return -1;
a += grub_le_to_cpu64 (frag.offset); a = grub_le_to_cpu64 (frag.offset) + grub_le_to_cpu32 (data->ino.chunk);
a += grub_le_to_cpu32 (data->ino.chunk);
} }
a += grub_le_to_cpu32 (data->ino.offset) + file->offset;
err = grub_disk_read (file->device->disk, a >> GRUB_DISK_SECTOR_BITS, err = grub_disk_read (file->device->disk, a >> GRUB_DISK_SECTOR_BITS,
a & (GRUB_DISK_SECTOR_SIZE - 1), len, buf); a & (GRUB_DISK_SECTOR_SIZE - 1), len, buf);
if (err) if (err)