Index: uspace/lib/minix/minix.h
===================================================================
--- uspace/lib/minix/minix.h	(revision 86d0b4b394df8795d06247979ae9eded47c3521c)
+++ uspace/lib/minix/minix.h	(revision 9cfe0d55a31b3e0716d7cfe6773244af0c128a5d)
@@ -36,10 +36,13 @@
 #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,4 +51,8 @@
 #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,5 +133,5 @@
 
 /*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,6 +146,6 @@
 } __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;