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 916e8f7..13fe09e 100644 (file)
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_MINIX_FS_H
 #define _LINUX_MINIX_FS_H
 
+#include <linux/types.h>
 #include <linux/magic.h>
 
 /*
@@ -25,7 +26,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 +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