Changeset 8ceba1e in mainline

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

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/app/mkminix/mkminix.c (modified) (6 diffs)
• uspace/srv/fs/minixfs/mfs.c (modified) (1 diff)
• uspace/srv/fs/minixfs/mfs_super.c (modified) (4 diffs)

boot/Makefile.common

@@ -97 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/minixfs/mfs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \

uspace/app/mkminix/mkminix.c

@@ -57 +57 @@
 #define USED    1
 
-#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 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 CONVERT_1K_OFF(off, bs)         ((off) * ((bs) / MFS_MIN_BLOCKSIZE))
 
 typedef enum {
@@ -319 +320 @@
         int rc;
         long itable_off;
+        unsigned long itable_size;
 
         itable_off = FIRST_ZONE(sb->block_size);
@@ -324 +326 @@
 
         /*Convert to 1K offset*/
-        itable_off *= sb->block_size / MFS_MIN_BLOCKSIZE;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size);
+        itable_size = CONVERT_1K_OFF(sb->itable_size, sb->block_size);
 
         itable_buf = malloc(sb->block_size);
@@ -333 +336 @@
         memset(itable_buf, 0x00, sb->block_size);
 
-        for (i = 0; i < sb->itable_size * (sb->block_size / MFS_MIN_BLOCKSIZE); ++i, ++itable_off) {
+        for (i = 0; i < itable_size; ++i, ++itable_off) {
                 rc = block_write_direct(sb->handle, itable_off, 1, itable_buf);
 
@@ -386 +389 @@
 
         /*Convert to 1K block offset*/
-        itable_off *= sb->block_size / MFS_MIN_BLOCKSIZE;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size);
 
         const time_t sec = time(NULL);
@@ -570 +573 @@
 
         /*Convert to 1K block offsets*/
-        ibmap_nblocks *= sb->block_size / MFS_BLOCKSIZE;
-        zbmap_nblocks *= sb->block_size / MFS_BLOCKSIZE;
+        ibmap_nblocks = CONVERT_1K_OFF(ibmap_nblocks, sb->block_size);
+        zbmap_nblocks = CONVERT_1K_OFF(zbmap_nblocks, sb->block_size);
 
         ibmap_buf8 = (uint8_t *) ibmap_buf;
         zbmap_buf8 = (uint8_t *) zbmap_buf;
 
+        int start_block = FIRST_ZONE(sb->block_size);
+
         for (i = 0; i < ibmap_nblocks; ++i) {
-                if ((rc = block_write_direct(sb->handle, 2 + i,
+                if ((rc = block_write_direct(sb->handle, start_block + i,
                                 1, (ibmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;
         }
 
+        start_block = FIRST_ZONE(sb->block_size) + ibmap_nblocks;
+
         for (i = 0; i < zbmap_nblocks; ++i) {
-                if ((rc = block_write_direct(sb->handle, 2 + ibmap_nblocks + i,
+                if ((rc = block_write_direct(sb->handle, start_block + i,
                                 1, (zbmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;

uspace/srv/fs/minixfs/mfs.c

@@ -99 +99 @@
                 default:
                 case IPC_M_PHONE_HUNGUP:
-                        return;         
+                        return;
+                case VFS_OUT_MOUNTED:
+                        mfs_mounted(callid, &call);
+                        break;
                 }
         }

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