Changeset 92dd5c8 in mainline for uspace/srv/fs/minixfs/mfs_super.c

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

File:

• uspace/srv/fs/minixfs/mfs_super.c (modified) (6 diffs)

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) {