netfilter: nf_conntrack: support conntrack templates

[safe/jmp/linux-2.6] / include / linux / minix_fs.h

diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h
index 1ecc3cc..13fe09e 100644 (file)
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -1,6 +1,9 @@
 #ifndef _LINUX_MINIX_FS_H
 #define _LINUX_MINIX_FS_H
 
+#include <linux/types.h>
+#include <linux/magic.h>
+
 /*
  * The minix filesystem constants/structures
  */
@@ -19,15 +22,10 @@
 
 #define MINIX_I_MAP_SLOTS      8
 #define MINIX_Z_MAP_SLOTS      64
-#define MINIX_SUPER_MAGIC      0x137F          /* original minix fs */
-#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 MINIX_VALID_FS         0x0001          /* Clean fs. */
 #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.
@@ -77,9 +75,32 @@ struct minix_super_block {
        __u32 s_zones;
 };
 
+/*
+ * V3 minix super-block data on disk
+ */
+struct minix3_super_block {
+       __u32 s_ninodes;
+       __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