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

unify minix3 and minix2 inode declarations

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-11 08:56:42 +02:00
parent 58ee1408a8
commit 65f01628e1
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
grub-core/fs/minix.c
View File

@ -107,41 +107,7 @@ struct grub_minix_sblock
};
#endif
#if defined(MODE_MINIX3)
struct grub_minix_inode
{
grub_uint16_t mode;
grub_uint16_t nlinks;
grub_uint16_t uid;
grub_uint8_t gid;
grub_uint8_t pad;
grub_uint32_t size;
grub_uint32_t atime;
grub_uint32_t mtime;
grub_uint32_t ctime;
grub_uint32_t dir_zones[7];
grub_uint32_t indir_zone;
grub_uint32_t double_indir_zone;
grub_uint32_t unused;
};
#elif !defined(MODE_MINIX2)
struct grub_minix_inode
{
grub_uint16_t mode;
grub_uint16_t uid;
grub_uint16_t size;
grub_uint32_t ctime;
grub_uint8_t gid;
grub_uint8_t nlinks;
grub_uint16_t dir_zones[7];
grub_uint16_t indir_zone;
grub_uint16_t double_indir_zone;
};
#else
#if defined(MODE_MINIX3) || defined(MODE_MINIX2)
struct grub_minix_inode
{
grub_uint16_t mode;
@ -158,6 +124,19 @@ struct grub_minix_inode
grub_uint32_t unused;
};
#else
struct grub_minix_inode
{
grub_uint16_t mode;
grub_uint16_t uid;
grub_uint16_t size;
grub_uint32_t ctime;
grub_uint8_t gid;
grub_uint8_t nlinks;
grub_uint16_t dir_zones[7];
grub_uint16_t indir_zone;
grub_uint16_t double_indir_zone;
};
#endif