Changeset 3c616f6 in mainline

Timestamp:

2011-03-08T17:08:42Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

fd282ad

Parents:

d4d425c

Message:

Fix directory entries structures

Location:

uspace

Files:

• app/mkminix/mkminix.c (modified) (1 diff)
• lib/minix/minix.h (modified) (1 diff)

uspace/app/mkminix/mkminix.c

@@ -96 +96 @@
         { "help", no_argument, 0, 'h' },
         { "long-names", no_argument, 0, 'l' },
-        { "blocks", required_argument, 0, 'b' },
+        { "block-size", required_argument, 0, 'b' },
         { "inodes", required_argument, 0, 'i' },
         { NULL, no_argument, 0, '1' },

uspace/lib/minix/minix.h

@@ -176 +176 @@
 struct mfs_dentry {
         uint16_t d_inum;
-        char d_name[MFS_MAX_NAME_LEN];
-} __attribute__ ((packed));
-
-/*MinixFS V1/V2 with 30-char filenames (Linux variant)*/
-struct mfs_l_dentry {
-        uint16_t d_inum;
-        char d_name[MFS_L_MAX_NAME_LEN];
-} __attribute__ ((packed));
+        char d_name[0];
+};
 
 /*MinixFS V3 directory entry on-disk structure*/
 struct mfs3_dentry {
         uint32_t d_inum;
-        char d_name[MFS3_MAX_NAME_LEN];
-} __attribute__ ((packed));
+        char d_name[0];
+};