From: Sami Kerola <kerolasa@iki.fi>
Date: Thu, 14 Jul 2011 15:27:33 +0000 (+0200)
Subject: libblkid: use superblock structure from minix.h
X-Git-Tag: v2.20-rc1~71^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a38887352ae94ea0055c2895892755ee8df6bb7d;p=thirdparty%2Futil-linux.git

libblkid: use superblock structure from minix.h

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
index 3290c27556..1d721c0fed 100644
--- a/libblkid/src/superblocks/minix.c
+++ b/libblkid/src/superblocks/minix.c
@@ -11,35 +11,7 @@
 
 #include <string.h>
 #include "superblocks.h"
-
-struct minix_super_block {
-        uint16_t s_ninodes;
-        uint16_t s_nzones;
-        uint16_t s_imap_blocks;
-        uint16_t s_zmap_blocks;
-        uint16_t s_firstdatazone;
-        uint16_t s_log_zone_size;
-        uint32_t s_max_size;
-        uint16_t s_magic;
-        uint16_t s_state;
-        uint32_t s_zones;
-};
-
-struct minix3_super_block {
-	uint32_t s_ninodes;
-	uint16_t s_pad0;
-	uint16_t s_imap_blocks;
-	uint16_t s_zmap_blocks;
-	uint16_t s_firstdatazone;
-	uint16_t s_log_zone_size;
-	uint16_t s_pad1;
-	uint32_t s_max_size;
-	uint32_t s_zones;
-	uint16_t s_magic;
-	uint16_t s_pad2;
-	uint16_t s_blocksize;
-	uint8_t  s_disk_version;
-};
+#include "minix.h"
 
 #define MINIX_BLOCK_SIZE_BITS 10
 #define MINIX_BLOCK_SIZE (1 << MINIX_BLOCK_SIZE_BITS)