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

2008-06-13 Bean <bean123ch@gmail.com>

Browse source 
* commands/hexdump.c (grub_cmd_hexdump): Adjust offset for partition.

	* fs/ext2.c (grub_ext3_get_journal): Fix revoke block handling.

	* fs/fshelp.c (grub_fshelp_map_block): Don't map block 0 as it's used
	to indicate sparse block.
This commit is contained in:
bean 2008-06-13 06:47:46 +00:00
parent e6d1a308ed
commit dfe9ddd4cb
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fs/ext2.c
View file

@ -436,12 +436,12 @@ grub_ext3_get_journal (struct grub_ext2_data *data)
{
struct grub_ext3_journal_header *jh;
if (grub_fshelp_read_file (data->disk, &data->logfile, 0,
block << (log2bs + 9), sizeof (buf),
buf, grub_ext2_read_block,
log->last_block << (log2bs + 9),
log2bs) !=
(int) sizeof (buf))
grub_fshelp_read_file (data->disk, &data->logfile, 0,
block << (log2bs + 9), sizeof (buf),
buf, grub_ext2_read_block,
log->last_block << (log2bs + 9),
log2bs);
if (grub_errno)
break;
jh = (struct grub_ext3_journal_header *) &buf[0];
@ -493,11 +493,13 @@ grub_ext3_get_journal (struct grub_ext2_data *data)
case EXT3_JOURNAL_REVOKE_BLOCK:
{
struct grub_ext3_journal_revoke_header *jrh;
grub_uint32_t i;
grub_uint32_t i, cnt;
jrh = (struct grub_ext3_journal_revoke_header *) jh;
cnt = (grub_be_to_cpu32 (jrh->count) -
sizeof (struct grub_ext3_journal_revoke_header)) >> 2;
for (i = 0; i < grub_be_to_cpu32 (jrh->count); i++)
for (i = 0; i < cnt; i++)
{
int j;
grub_uint32_t map;