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

2008-06-12 Pavel Roskin <proski@gnu.org>

Browse source 
* fs/ext2.c (grub_ext2_read_inode): Don't normalize block
	number, grub_fshelp_read() does it for us.
This commit is contained in:
proski 2008-06-12 16:13:21 +00:00
parent 16ae7781ef
commit e6d1a308ed
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-06-12 Pavel Roskin <proski@gnu.org> 2008-06-12 Pavel Roskin <proski@gnu.org>
* fs/ext2.c (grub_ext2_read_inode): Don't normalize block
number, grub_fshelp_read() does it for us.
* fs/fshelp.c (grub_fshelp_read): New function. Implement * fs/fshelp.c (grub_fshelp_read): New function. Implement
linear disk read with journal translation. linear disk read with journal translation.
* fs/ext2.c: Use grub_fshelp_read() instead of grub_disk_read(). * fs/ext2.c: Use grub_fshelp_read() instead of grub_disk_read().

11
fs/ext2.c
View file

@ -344,9 +344,6 @@ grub_ext2_read_inode (struct grub_ext2_data *data,
{ {
struct grub_ext2_block_group blkgrp; struct grub_ext2_block_group blkgrp;
struct grub_ext2_sblock *sblock = &data->sblock; struct grub_ext2_sblock *sblock = &data->sblock;
int inodes_per_block;
unsigned int blkno;
unsigned int blkoff; unsigned int blkoff;
/* It is easier to calculate if the first inode is 0. */ /* It is easier to calculate if the first inode is 0. */
@ -358,15 +355,11 @@ grub_ext2_read_inode (struct grub_ext2_data *data,
if (grub_errno) if (grub_errno)
return grub_errno; return grub_errno;
inodes_per_block = EXT2_BLOCK_SIZE (data) / EXT2_INODE_SIZE (data); blkoff = ino % grub_le_to_cpu32 (sblock->inodes_per_group);
blkno = (ino % grub_le_to_cpu32 (sblock->inodes_per_group))
/ inodes_per_block;
blkoff = (ino % grub_le_to_cpu32 (sblock->inodes_per_group))
% inodes_per_block;
/* Read the inode. */ /* Read the inode. */
if (grub_fshelp_read (data->disk, data->journal, if (grub_fshelp_read (data->disk, data->journal,
grub_le_to_cpu32 (blkgrp.inode_table_id) + blkno, grub_le_to_cpu32 (blkgrp.inode_table_id),
EXT2_INODE_SIZE (data) * blkoff, EXT2_INODE_SIZE (data) * blkoff,
sizeof (struct grub_ext2_inode), (char *) inode, sizeof (struct grub_ext2_inode), (char *) inode,
LOG2_EXT2_BLOCK_SIZE (data))) LOG2_EXT2_BLOCK_SIZE (data)))