2 files changed, 25 insertions, 1 deletions

diff --git a/include/linux/magic.h b/include/linux/magic.h
index b78bbf42135a..b32c8a97fcec 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -18,6 +18,7 @@
 #define MINIX_SUPER_MAGIC2      0x138F          /* minix fs, 30 char names */
 #define MINIX2_SUPER_MAGIC      0x2468          /* minix V2 fs */
 #define MINIX2_SUPER_MAGIC2     0x2478          /* minix V2 fs, 30 char names */
+#define MINIX3_SUPER_MAGIC      0x4d5a          /* minix V3 fs */
 
 #define MSDOS_SUPER_MAGIC       0x4d44          /* MD */
 #define NCP_SUPER_MAGIC         0x564c          /* Guess, what 0x564c is :-) */
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h
index 916e8f72c63d..9850d513ff60 100644
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -25,7 +25,6 @@
 #define MINIX_ERROR_FS          0x0002          /* fs has errors. */
 
 #define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
 
 /*
  * This is the original minix inode layout on disk.
@@ -75,9 +74,33 @@ struct minix_super_block {
         __u32 s_zones;
 };
 
+/*
+ * V3 minix super-block data on disk
+ */
+struct minix3_super_block {
+        __u16 s_ninodes;
+        __u16 s_nzones;
+        __u16 s_pad0;
+        __u16 s_imap_blocks;
+        __u16 s_zmap_blocks;
+        __u16 s_firstdatazone;
+        __u16 s_log_zone_size;
+        __u16 s_pad1;
+        __u32 s_max_size;
+        __u32 s_zones;
+        __u16 s_magic;
+        __u16 s_pad2;
+        __u16 s_blocksize;
+        __u8  s_disk_version;
+};
+
 struct minix_dir_entry {
         __u16 inode;
         char name[0];
 };
 
+struct minix3_dir_entry {
+        __u32 inode;
+        char name[0];
+};
 #endif