Changeset 245eb02d in mainline

Timestamp:

2011-03-15T17:47:26Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f66d903

Parents:

92dd5c8

Message:

Check for V3 magic number when a mount is performed

File:

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

uspace/srv/fs/minixfs/mfs_super.c

@@ -49 +49 @@
         enum cache_mode cmode;  
         struct mfs_superblock *sp;
+        struct mfs3_superblock *sp3;
         bool native, longnames;
         mfs_version_t version;
+        uint16_t magic;
 
         /* Accept the mount options */
@@ -78 +80 @@
         }
 
-        sp = malloc(MFS_SUPERBLOCK_SIZE);
+        sp = (struct mfs_superblock *) malloc(MFS_SUPERBLOCK_SIZE);
 
         /* Read the superblock */
@@ -88 +90 @@
         }
 
-        if (!check_magic_number(sp->s_magic, &native, &version, &longnames)) {
-                /*Magic number is invalid!*/
+        if (check_magic_number(sp->s_magic, &native, &version, &longnames)) {
+                magic = sp->s_magic;
+                goto recognized;
+        }
+
+        sp3 = (struct mfs3_superblock *) sp;
+
+        if (!check_magic_number(sp3->s_magic, &native, &version, &longnames)) {
                 mfsdebug("magic number not recognized\n");
                 block_fini(devmap_handle);
@@ -96 +104 @@
         }
 
-        mfsdebug("magic number recognized\n");
+        magic = sp3->s_magic;
+
+recognized:
+
+        mfsdebug("magic number recognized = %04x\n", magic);
         free(sp);
 }
@@ -104 +116 @@
 {
         *longfilenames = false;
-
-        mfsdebug("magic = %d\n", magic);
 
         if (magic == MFS_MAGIC_V1 || magic == MFS_MAGIC_V1R) {