Changeset 82650385 in mainline

Timestamp:

2011-03-05T17:11:24Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3564cdd

Parents:

939b7d2

Message:

export minixfs headers into a separate library

Location:

uspace

Files:

• app/mkminix/mfs_const.h (deleted)
• app/mkminix/mfs_dentry.h (deleted)
• app/mkminix/mfs_inode.h (deleted)
• app/mkminix/mfs_super.h (deleted)
• app/mkminix/mkminix.c (modified) (2 diffs)
• lib/c/include/fs/minix.h (moved) (moved from uspace/srv/fs/minixfs/mfs_super.h ) (3 diffs)
• srv/fs/minixfs/mfs.c (modified) (1 diff)
• srv/fs/minixfs/mfs.h (modified) (1 diff)
• srv/fs/minixfs/mfs_const.h (deleted)
• srv/fs/minixfs/mfs_dentry.h (deleted)
• srv/fs/minixfs/mfs_inode.h (deleted)
• srv/fs/minixfs/mfs_super.c (modified) (1 diff)
• srv/fs/minixfs/mfs_utils.h (modified) (1 diff)

uspace/app/mkminix/mkminix.c

@@ -48 +48 @@
 #include <getopt.h>
 #include <mem.h>
-#include "mfs_const.h"
-#include "mfs_inode.h"
-#include "mfs_super.h"
+#include <fs/minix.h>
 
 #define NAME    "mkminix"
@@ -264 +262 @@
                 "           valid block size values are 1024, 2048 and 4096 bytes per block\n"
                 "-i ##      Specify the number of inodes for the filesystem\n"
-                "-l         Use 30-char long filenames (V1/V2 only)");
+                "-l         Use 30-char long filenames (V1/V2 only)\n");
         }
 }

uspace/lib/c/include/fs/minix.h

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
-#ifndef _MFS_SUPER_H_
-#define _MFS_SUPER_H_
+#ifndef _MINIX_FS_H_
+#define _MINIX_FS_H_
 
-#include "mfs_const.h"
+#include <sys/types.h>
+#include <bool.h>
+
+#define MFS_MAX_BLOCK_SIZE      4096
+#define MFS_MIN_BLOCK_SIZE      1024
+
+#define MFS_ROOT_INO            1
+#define MFS_SUPER_BLOCK         0
+#define MFS_SUPER_BLOCK_SIZE    1024
+
+#define V2_NR_DIRECT_ZONES      7
+#define V2_NR_INDIRECT_ZONES    3
+
+#define V1_NR_DIRECT_ZONES      7
+#define V1_NR_INDIRECT_ZONES    2
+
+#define V1_MAX_NAME_LEN         14
+#define V1L_MAX_NAME_LEN        30
+#define V2_MAX_NAME_LEN         14
+#define V2L_MAX_NAME_LEN        30
+#define V3_MAX_NAME_LEN         60
 
 #define MFS_MAGIC_V1            0x137F
@@ -108 +128 @@
 } __attribute__ ((packed));
 
-typedef enum {
-        MFS_VERSION_V1 = 1,
-        MFS_VERSION_V1L,
-        MFS_VERSION_V2,
-        MFS_VERSION_V2L,
-        MFS_VERSION_V3
-} mfs_version_t;
+/*MinixFS V1 inode structure as it is on disk*/
+struct mfs_v1_inode {
+        uint16_t        i_mode;
+        int16_t         i_uid;
+        int32_t         i_size;
+        int32_t         i_mtime;
+        uint8_t         i_gid;
+        uint8_t         i_nlinks;
+        /*Block numbers for direct zones*/
+        uint16_t        i_dzone[V1_NR_DIRECT_ZONES];
+        /*Block numbers for indirect zones*/
+        uint16_t        i_izone[V1_NR_INDIRECT_ZONES];
+} __attribute__ ((packed));
+
+/*MinixFS V2 inode structure as it is on disk.*/
+struct mfs_v2_inode {
+        uint16_t        i_mode;
+        uint16_t        i_nlinks;
+        int16_t         i_uid;
+        uint16_t        i_gid;
+        int32_t         i_size;
+        int32_t         i_atime;
+        int32_t         i_mtime;
+        int32_t         i_ctime;
+        /*Block numbers for direct zones*/
+        uint32_t        i_dzone[V2_NR_DIRECT_ZONES];
+        /*Block numbers for indirect zones*/
+        uint32_t        i_izone[V2_NR_INDIRECT_ZONES];
+} __attribute__ ((packed));
+
+#define mfs_v2_dentry   mfs_v1_dentry
+#define mfs_v1l_dentry  mfs_v2l_dentry
+
+/*MinixFS V1 directory entry on-disk structure*/
+struct mfs_v1_dentry {
+        uint16_t d_inum;
+        char d_name[V1_MAX_NAME_LEN];
+} __attribute__ ((packed));
+
+/*MinixFS V2 with 30-char filenames (Linux variant)*/
+struct mfs_v2l_dentry {
+        uint16_t d_inum;
+        char d_name[V2L_MAX_NAME_LEN];
+} __attribute__ ((packed));
+
+/*MinixFS V3 directory entry on-disk structure*/
+struct mfs_v3_dentry {
+        uint32_t d_inum;
+        char d_name[V3_MAX_NAME_LEN];
+} __attribute__ ((packed));
+
 
 #endif
@@ -120 +184 @@
 /**
  * @}
- */ 
+ */
+

uspace/srv/fs/minixfs/mfs.c

@@ -47 +47 @@
 #include <libfs.h>
 #include "mfs.h"
-#include "mfs_super.h"
 
 #define NAME    "mfs"

uspace/srv/fs/minixfs/mfs.h

@@ -34 +34 @@
 #define _MFS_H_
 
-#include "mfs_const.h"
+#include <fs/minix.h>
 #include "../../vfs/vfs.h"
+
+typedef enum {
+        MFS_VERSION_V1 = 1,
+        MFS_VERSION_V1L,
+        MFS_VERSION_V2,
+        MFS_VERSION_V2L,
+        MFS_VERSION_V3
+} mfs_version_t;
 
 extern void mfs_mounted(ipc_callid_t rid, ipc_call_t *request);

uspace/srv/fs/minixfs/mfs_super.c

@@ -37 +37 @@
 #include <str.h>
 #include "mfs.h"
-#include "mfs_super.h"
 #include "mfs_utils.h"
 #include "../../vfs/vfs.h"

uspace/srv/fs/minixfs/mfs_utils.h

@@ -31 +31 @@
  */
 
-#include "mfs_const.h"
+#ifndef _MFS_UTILS_H_
+#define _MFS_UTILS_H_
+
+#include <sys/types.h>
+#include <bool.h>
 
 uint16_t conv16(bool native, uint16_t n);
 uint32_t conv32(bool native, uint32_t n);
+
+#endif
 
 /**