Changeset 92dd5c8 in mainline

Timestamp:

2011-03-13T20:14: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:

245eb02d

Parents:

ccbc5b56

Message:

Read superblock and look for a corrispondent magic number, fix first data zone calculation in mkminix

Location:

uspace

Files:

• app/mkminix/mkminix.c (modified) (6 diffs)
• srv/fs/minixfs/mfs.c (modified) (1 diff)
• srv/fs/minixfs/mfs.h (modified) (1 diff)
• srv/fs/minixfs/mfs_super.c (modified) (6 diffs)

uspace/app/mkminix/mkminix.c ¶

@@ -58 +58 @@
 #define UPPER(n, size)                  (((n) / (size)) + (((n) % (size)) != 0))
 #define NEXT_DENTRY(p, dirsize)         (p += dirsize)
-#define FIRST_ZONE(bs)                  ((MFS_BOOTBLOCK_SIZE + MFS_SUPERBLOCK_SIZE) / (bs))
+#define FIRST_ZONE(bs)                  (1 + (bs) / MFS_MIN_BLOCKSIZE)
 #define CONVERT_1K_OFF(off, bs)         ((off) * ((bs) / MFS_MIN_BLOCKSIZE))
 
@@ -329 +329 @@
 
         /*Convert to 1K offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) +
+                                        FIRST_ZONE(sb->block_size);
         itable_size = CONVERT_1K_OFF(sb->itable_size, sb->block_size);
 
@@ -392 +393 @@
 
         /*Convert to 1K block offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) +
+                                        FIRST_ZONE(sb->block_size);
 
         const time_t sec = time(NULL);
@@ -468 +470 @@
 
         /*Compute first data zone position*/
-        sb->first_data_zone = FIRST_ZONE(sb->block_size) + sb->itable_size + 
+        sb->first_data_zone = 2 + sb->itable_size + 
                                 sb->zbmap_blocks + sb->ibmap_blocks;
 
@@ -582 +584 @@
         zbmap_buf8 = (uint8_t *) zbmap_buf;
 
-        int start_block = 2;
+        int start_block = FIRST_ZONE(sb->block_size);
 
         for (i = 0; i < ibmap_nblocks; ++i) {
@@ -590 +592 @@
         }
 
-        start_block = 2 + ibmap_nblocks;
+        start_block = FIRST_ZONE(sb->block_size) + ibmap_nblocks;
 
         for (i = 0; i < zbmap_nblocks; ++i) {

uspace/srv/fs/minixfs/mfs.c ¶

@@ -97 +97 @@
                 callid = async_get_call(&call);
                 switch  (IPC_GET_IMETHOD(call)) {
-                default:
                 case IPC_M_PHONE_HUNGUP:
                         return;
                 case VFS_OUT_MOUNTED:
+                        mfsdebug("Mount request received\n");
                         mfs_mounted(callid, &call);
+                        break;
+                case VFS_OUT_MOUNT:
+                        mfsdebug("Mounting...\n");
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }

uspace/srv/fs/minixfs/mfs.h ¶

@@ -37 +37 @@
 #include "../../vfs/vfs.h"
 
+#define DEBUG_MODE
+
+#ifdef DEBUG_MODE
+#define mfsdebug(...)   printf(__VA_ARGS__)
+#else
+#define mfsdebug(...)
+#endif
+
 typedef enum {
         MFS_VERSION_V1 = 1,

uspace/srv/fs/minixfs/mfs_super.c ¶

@@ -32 +32 @@
 
 #include <libfs.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <libblock.h>
@@ -47 +48 @@
         devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         enum cache_mode cmode;  
-        struct mfs3_superblock *sp;
+        struct mfs_superblock *sp;
         bool native, longnames;
         mfs_version_t version;
@@ -56 +57 @@
         
         if (rc != EOK) {
+                mfsdebug("Can't accept async data write\n");
                 async_answer_0(rid, rc);
                 return;
@@ -69 +71 @@
 
         /* initialize libblock */
-        rc = block_init(devmap_handle, MFS_SUPERBLOCK_SIZE);
+        rc = block_init(devmap_handle, 1024);
         if (rc != EOK) {
+                mfsdebug("libblock initialization failed\n");
                 async_answer_0(rid, rc);
                 return;
         }
 
-        /* prepare the superblock */
-        rc = block_bb_read(devmap_handle, MFS_SUPERBLOCK);
+        sp = malloc(MFS_SUPERBLOCK_SIZE);
+
+        /* Read the superblock */
+        rc = block_read_direct(devmap_handle, MFS_SUPERBLOCK << 1, 1, sp);
         if (rc != EOK) {
                 block_fini(devmap_handle);
@@ -83 +88 @@
         }
 
-        /* get the buffer with the superblock */
-        sp = block_bb_get(devmap_handle);
-
         if (!check_magic_number(sp->s_magic, &native, &version, &longnames)) {
                 /*Magic number is invalid!*/
+                mfsdebug("magic number not recognized\n");
                 block_fini(devmap_handle);
                 async_answer_0(rid, ENOTSUP);
                 return;
         }
+
+        mfsdebug("magic number recognized\n");
+        free(sp);
 }
 
@@ -98 +104 @@
 {
         *longfilenames = false;
+
+        mfsdebug("magic = %d\n", magic);
 
         if (magic == MFS_MAGIC_V1 || magic == MFS_MAGIC_V1R) {