Changeset eee8007 in mainline for uspace/srv

Timestamp:

2011-03-05T09:49:33Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

55c51c28

Parents:

1ffbbc1

Message:

Add support to long filenames, improve mkminix

Location:

uspace/srv/fs/minixfs

Files:

• mfs_const.h (modified) (1 diff)
• mfs_dentry.h (modified) (2 diffs)
• mfs_super.h (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs_const.h

@@ -53 +53 @@
 #define V1_MAX_NAME_LEN         14
 #define V2_MAX_NAME_LEN         14
+#define V2E_MAX_NAME_LEN        30
 #define V3_MAX_NAME_LEN         60
 

uspace/srv/fs/minixfs/mfs_dentry.h

@@ -37 +37 @@
 
 #define mfs_v2_dentry   mfs_v1_dentry
+#define mfs_v1l_dentry  mfs_v2l_dentry
 
 /*MinixFS V1 directory entry on-disk structure*/
@@ -42 +43 @@
         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[V2E_MAX_NAME_LEN];
 } __attribute__ ((packed));
 

uspace/srv/fs/minixfs/mfs_super.h

@@ -39 +39 @@
 #define MFS_MAGIC_V1R           0x7F13
 
+#define MFS_MAGIC_V1L           0x138F
+#define MFS_MAGIC_V1LR          0x8F13
+
 #define MFS_MAGIC_V2            0x2468
 #define MFS_MAGIC_V2R           0x6824
+
+#define MFS_MAGIC_V2L           0x2478
+#define MFS_MAGIC_V2LR          0x7824
 
 #define MFS_MAGIC_V3            0x4D5A
@@ -104 +110 @@
 typedef enum {
         MFS_VERSION_V1 = 1,
+        MFS_VERSION_V1L,
         MFS_VERSION_V2,
+        MFS_VERSION_V2L,
         MFS_VERSION_V3
 } mfs_version_t;