Changeset 7413683 in mainline

Timestamp:

2011-03-04T18:32:29Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

63ffffd

Parents:

eaf9794

Message:

Do not duplicate code, use symbolic lynks instead of copy-paste

Location:

uspace

Files:

• app/mkminix/mfs.h (deleted)
• app/mkminix/mfs_const.h (added)
• app/mkminix/mfs_inode.h (added)
• app/mkminix/mfs_super.h (added)
• app/mkminix/mkminix.c (modified) (2 diffs)
• srv/fs/minixfs/mfs.c (modified) (1 diff)
• srv/fs/minixfs/mfs_const.h (modified) (1 diff)
• srv/fs/minixfs/mfs_super.c (modified) (1 diff)
• srv/fs/minixfs/mfs_super.h (modified) (4 diffs)

uspace/app/mkminix/mkminix.c

@@ -48 +48 @@
 #include <getopt.h>
 #include <mem.h>
-#include "mfs.h"
+#include "mfs_const.h"
+#include "mfs_inode.h"
+#include "mfs_super.h"
 
 #define NAME    "mkminix"
@@ -84 +86 @@
         size_t devblock_size;
         unsigned long n_inodes = 0;
-
-        struct mfs_superblock *sb;
-        sb = (struct mfs_superblock *) malloc(sizeof(struct mfs_superblock));
 
         if (argc == 1) {

uspace/srv/fs/minixfs/mfs.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <libfs.h>
-#include "../../vfs/vfs.h"
-#include "mfs_const.h"
+#include "mfs.h"
 #include "mfs_super.h"
 

uspace/srv/fs/minixfs/mfs_const.h

@@ -38 +38 @@
 #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

uspace/srv/fs/minixfs/mfs_super.c

@@ -36 +36 @@
 #include <errno.h>
 #include <str.h>
+#include "mfs.h"
 #include "mfs_super.h"
 #include "mfs_utils.h"

uspace/srv/fs/minixfs/mfs_super.h

@@ -35 +35 @@
 
 #include "mfs_const.h"
-#include "../../vfs/vfs.h"
 
 #define MFS_MAGIC_V1            0x137F
@@ -46 +45 @@
 #define MFS_MAGIC_V3R           0x5A4D
 
+/*V3 superblock data on disk*/
 struct mfs_superblock {
         /*Total number of inodes on the device*/
@@ -66 +66 @@
         /*Magic number used to recognize MinixFS and to detect on-disk endianness*/
         int16_t         s_magic;
-
-        /* The following fields are valid only for MinixFS V3 */
-
         int16_t         s_pad2;
         /*Filesystem block size expressed in bytes*/
@@ -82 +79 @@
 } mfs_version_t;
 
-void mfs_mounted(ipc_callid_t rid, ipc_call_t *request);
-
 #endif