Changeset 8ceba1e in mainline for uspace/srv/fs/minixfs/mfs_super.c

Timestamp:

2011-03-09T22:02:53Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c4c7f5a

Parents:

b00a2f2

Message:

Improve minixfs server check_magic_number() function

File:

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

uspace/srv/fs/minixfs/mfs_super.c

@@ -40 +40 @@
 #include "../../vfs/vfs.h"
 
-static bool check_magic_number(int16_t magic, bool *native, mfs_version_t *version);
+static bool check_magic_number(uint16_t magic, bool *native,
+                                mfs_version_t *version, bool *longfilenames);
 
 void mfs_mounted(ipc_callid_t rid, ipc_call_t *request)
@@ -47 +48 @@
         enum cache_mode cmode;  
         struct mfs3_superblock *sp;
-        bool native;
+        bool native, longnames;
         mfs_version_t version;
 
@@ -85 +86 @@
         sp = block_bb_get(devmap_handle);
 
-        if (!check_magic_number(sp->s_magic, &native, &version)) {
+        if (!check_magic_number(sp->s_magic, &native, &version, &longnames)) {
                 /*Magic number is invalid!*/
                 block_fini(devmap_handle);
@@ -93 +94 @@
 }
 
-static bool check_magic_number(int16_t magic, bool *native, mfs_version_t *version)
+static bool check_magic_number(uint16_t magic, bool *native,
+                                mfs_version_t *version, bool *longfilenames)
 {
+        *longfilenames = false;
+
         if (magic == MFS_MAGIC_V1 || magic == MFS_MAGIC_V1R) {
                 *native = magic == MFS_MAGIC_V1;
                 *version = MFS_VERSION_V1;
                 return true;
+        } else if (magic == MFS_MAGIC_V1L || magic == MFS_MAGIC_V1LR) {
+                *native = magic == MFS_MAGIC_V1L;
+                *version = MFS_VERSION_V1;
+                *longfilenames = true;
+                return true;
         } else if (magic == MFS_MAGIC_V2 || magic == MFS_MAGIC_V2R) {
                 *native = magic == MFS_MAGIC_V2;
                 *version = MFS_VERSION_V2;
+                return true;
+        } else if (magic == MFS_MAGIC_V2L || magic == MFS_MAGIC_V2LR) {
+                *native = magic == MFS_MAGIC_V2L;
+                *version = MFS_VERSION_V2;
+                *longfilenames = true;
                 return true;
         } else if (magic == MFS_MAGIC_V3 || magic == MFS_MAGIC_V3R) {