From 65f01628e19d04be6cad0242d3056dbb656a54b2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Apr 2011 08:56:42 +0200
Subject: [PATCH] unify minix3 and minix2 inode declarations

---
 grub-core/fs/minix.c | 49 +++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c
index 877f71921..a01ee77ca 100644
--- a/grub-core/fs/minix.c
+++ b/grub-core/fs/minix.c
@@ -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