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

xfs: Convert inode numbers to cpu endianity immediately after reading

Browse source 
Currently XFS driver converted inode numbers to native endianity only
when using them to compute inode position. Although this works, it is
somewhat confusing. So convert inode numbers when reading them from disk
structures as every other field.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2014-07-14 17:21:30 +02:00 committed by Andrei Borzenkov
parent 1570140f03
commit a139188eb5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,14 +180,14 @@ static inline grub_uint64_t
GRUB_XFS_INO_INOINAG (struct grub_xfs_data *data, GRUB_XFS_INO_INOINAG (struct grub_xfs_data *data,
grub_uint64_t ino) grub_uint64_t ino)
{ {
return (grub_be_to_cpu64 (ino) & ((1LL << GRUB_XFS_INO_AGBITS (data)) - 1)); return (ino & ((1LL << GRUB_XFS_INO_AGBITS (data)) - 1));
} }
static inline grub_uint64_t static inline grub_uint64_t
GRUB_XFS_INO_AG (struct grub_xfs_data *data, GRUB_XFS_INO_AG (struct grub_xfs_data *data,
grub_uint64_t ino) grub_uint64_t ino)
{ {
return (grub_be_to_cpu64 (ino) >> GRUB_XFS_INO_AGBITS (data)); return (ino >> GRUB_XFS_INO_AGBITS (data));
} }
static inline grub_disk_addr_t static inline grub_disk_addr_t
@ -506,13 +506,12 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
if (smallino) if (smallino)
{ {
parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent.i4); parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent.i4);
parent = grub_cpu_to_be64 (parent);
/* The header is a bit smaller than usual. */ /* The header is a bit smaller than usual. */
de = (struct grub_xfs_dir_entry *) ((char *) de - 4); de = (struct grub_xfs_dir_entry *) ((char *) de - 4);
} }
else else
{ {
parent = diro->inode.data.dir.dirhead.parent.i8; parent = grub_be_to_cpu64(diro->inode.data.dir.dirhead.parent.i8);
} }
/* Synthesize the direntries for `.' and `..'. */ /* Synthesize the direntries for `.' and `..'. */
@ -545,7 +544,6 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
| (((grub_uint64_t) inopos[5]) << 16) | (((grub_uint64_t) inopos[5]) << 16)
| (((grub_uint64_t) inopos[6]) << 8) | (((grub_uint64_t) inopos[6]) << 8)
| (((grub_uint64_t) inopos[7]) << 0); | (((grub_uint64_t) inopos[7]) << 0);
ino = grub_cpu_to_be64 (ino);
c = de->name[de->len]; c = de->name[de->len];
de->name[de->len] = '\0'; de->name[de->len] = '\0';
@ -627,7 +625,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
is not used by GRUB. So it can be overwritten. */ is not used by GRUB. So it can be overwritten. */
filename[direntry->len] = '\0'; filename[direntry->len] = '\0';
if (iterate_dir_call_hook (direntry->inode, filename, &ctx)) if (iterate_dir_call_hook (grub_be_to_cpu64(direntry->inode),
filename, &ctx))
{ {
grub_free (dirblock); grub_free (dirblock);
return 1; return 1;
@ -689,7 +688,7 @@ grub_xfs_mount (grub_disk_t disk)
goto fail; goto fail;
data->diropen.data = data; data->diropen.data = data;
data->diropen.ino = data->sblock.rootino; data->diropen.ino = grub_be_to_cpu64(data->sblock.rootino);
data->diropen.inode_read = 1; data->diropen.inode_read = 1;
data->bsize = grub_be_to_cpu32 (data->sblock.bsize); data->bsize = grub_be_to_cpu32 (data->sblock.bsize);
data->agsize = grub_be_to_cpu32 (data->sblock.agsize); data->agsize = grub_be_to_cpu32 (data->sblock.agsize);