unify minix3 and minix2 inode declarations

diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c
index 877f719217b3bbec34fc6f11fe9e9468df30cb6f..a01ee77caf71b7435cceeb22cccf76f706cb97ba 100644 (file)
--- a/grub-core/fs/minix.c
+++ b/grub-core/fs/minix.c
@@ -107,15 +107,13 @@ struct grub_minix_sblock
 };
 #endif
 
-#if defined(MODE_MINIX3)
-
+#if defined(MODE_MINIX3) || defined(MODE_MINIX2)
 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_uint16_t gid;
   grub_uint32_t size;
   grub_uint32_t atime;
   grub_uint32_t mtime;
@@ -124,9 +122,9 @@ struct grub_minix_inode
   grub_uint32_t indir_zone;
   grub_uint32_t double_indir_zone;
   grub_uint32_t unused;
-};
 
-#elif !defined(MODE_MINIX2)
+};
+#else
 struct grub_minix_inode
 {
   grub_uint16_t mode;
@@ -140,25 +138,6 @@ struct grub_minix_inode
   grub_uint16_t double_indir_zone;
 };
 
-#else
-
-struct grub_minix_inode
-{
-  grub_uint16_t mode;
-  grub_uint16_t nlinks;
-  grub_uint16_t uid;
-  grub_uint16_t gid;
-  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;
-
-};
-
 #endif
 
 /* Information about a "mounted" minix filesystem.  */