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

xfs: Add helpers for inode size

Browse source 
Add helpers to return size of XFS inode on disk and when loaded in
memory.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2015-06-01 14:28:45 +02:00 committed by Andrei Borzenkov
parent 697eceff6a
commit d3ffeb9a9a
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
grub-core/fs/xfs.c
View file

@ -255,6 +255,24 @@ grub_xfs_inode_offset (struct grub_xfs_data *data,
data->sblock.log2_inode); data->sblock.log2_inode);
} }
static inline grub_size_t
grub_xfs_inode_size(struct grub_xfs_data *data)
{
return 1 << data->sblock.log2_inode;
}
/*
* Returns size occupied by XFS inode stored in memory - we store struct
* grub_fshelp_node there but on disk inode size may be actually larger than
* struct grub_xfs_inode so we need to account for that so that we can read
* from disk directly into in-memory structure.
*/
static inline grub_size_t
grub_xfs_fshelp_size(struct grub_xfs_data *data)
{
return sizeof (struct grub_fshelp_node) - sizeof (struct grub_xfs_inode)
+ grub_xfs_inode_size(data);
}
static grub_err_t static grub_err_t
grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino, grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
@ -264,8 +282,8 @@ grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
int offset = grub_xfs_inode_offset (data, ino); int offset = grub_xfs_inode_offset (data, ino);
/* Read the inode. */ /* Read the inode. */
if (grub_disk_read (data->disk, block, offset, if (grub_disk_read (data->disk, block, offset, grub_xfs_inode_size(data),
1 << data->sblock.log2_inode, inode)) inode))
return grub_errno; return grub_errno;
if (grub_strncmp ((char *) inode->magic, "IN", 2)) if (grub_strncmp ((char *) inode->magic, "IN", 2))
@ -297,7 +315,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
if (node->inode.fork_offset) if (node->inode.fork_offset)
recoffset = (node->inode.fork_offset - 1) / 2; recoffset = (node->inode.fork_offset - 1) / 2;
else else
recoffset = ((1 << node->data->sblock.log2_inode) recoffset = (grub_xfs_inode_size(node->data)
- ((char *) &node->inode.data.btree.keys - ((char *) &node->inode.data.btree.keys
- (char *) &node->inode)) - (char *) &node->inode))
/ (2 * sizeof (grub_uint64_t)); / (2 * sizeof (grub_uint64_t));
@ -456,9 +474,7 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
struct grub_fshelp_node *fdiro; struct grub_fshelp_node *fdiro;
grub_err_t err; grub_err_t err;
fdiro = grub_malloc (sizeof (struct grub_fshelp_node) fdiro = grub_malloc (grub_xfs_fshelp_size(ctx->diro->data) + 1);
- sizeof (struct grub_xfs_inode)
+ (1 << ctx->diro->data->sblock.log2_inode) + 1);
if (!fdiro) if (!fdiro)
{ {
grub_print_error (); grub_print_error ();
@ -682,7 +698,7 @@ grub_xfs_mount (grub_disk_t disk)
data = grub_realloc (data, data = grub_realloc (data,
sizeof (struct grub_xfs_data) sizeof (struct grub_xfs_data)
- sizeof (struct grub_xfs_inode) - sizeof (struct grub_xfs_inode)
+ (1 << data->sblock.log2_inode) + 1); + grub_xfs_inode_size(data) + 1);
if (! data) if (! data)
goto fail; goto fail;
@ -797,10 +813,7 @@ grub_xfs_open (struct grub_file *file, const char *name)
if (fdiro != &data->diropen) if (fdiro != &data->diropen)
{ {
grub_memcpy (&data->diropen, fdiro, grub_memcpy (&data->diropen, fdiro, grub_xfs_fshelp_size(data));
sizeof (struct grub_fshelp_node)
- sizeof (struct grub_xfs_inode)
+ (1 << data->sblock.log2_inode));
grub_free (fdiro); grub_free (fdiro);
} }