Changeset 68ed0fb in mainline for uspace/lib/minix/minix.h

Timestamp:

2011-03-06T14:49:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc24c5e

Parents:

86d0b4b3

Message:

prepare V1/V2 superblock and write it to disk

File:

• uspace/lib/minix/minix.h (modified) (4 diffs)

uspace/lib/minix/minix.h

@@ -36 +36 @@
 #include <sys/types.h>
 
-#define MFS_MAX_BLOCK_SIZE      4096
-#define MFS_MIN_BLOCK_SIZE      1024
+#define MFS_BLOCKSIZE           1024
+
+/*The following block sizes are valid only on V3 filesystem*/
+#define MFS_MIN_BLOCKSIZE       1024
+#define MFS_MAX_BLOCKSIZE       4096
 
 #define MFS_ROOT_INO            1
-#define MFS_SUPER_BLOCK         0
-#define MFS_SUPER_BLOCK_SIZE    1024
+#define MFS_SUPERBLOCK          1
+#define MFS_SUPERBLOCK_SIZE     1024
 
 #define V2_NR_DIRECT_ZONES      7
@@ -48 +51 @@
 #define V1_NR_DIRECT_ZONES      7
 #define V1_NR_INDIRECT_ZONES    2
+
+#define V1_INODES_PER_BLOCK     (MFS_BLOCKSIZE / sizeof(struct mfs_inode))
+#define V2_INODES_PER_BLOCK     (MFS_BLOCKSIZE / sizeof(struct mfs2_inode))
+#define V3_INODES_PER_BLOCK(bs) ((bs) / sizeof(struct mfs2_inode))
 
 #define MFS_MAX_NAME_LEN        14
@@ -126 +133 @@
 
 /*MinixFS V1 inode structure as it is on disk*/
-struct mfs_v1_inode {
+struct mfs_inode {
         uint16_t        i_mode;
         int16_t         i_uid;
@@ -139 +146 @@
 } __attribute__ ((packed));
 
-/*MinixFS V2 inode structure as it is on disk.*/
-struct mfs_v2_inode {
+/*MinixFS V2 inode structure as it is on disk (also valid for V3).*/
+struct mfs2_inode {
         uint16_t        i_mode;
         uint16_t        i_nlinks;