Changes in / [45a9cf4:f1d6866] in mainline

Location:

uspace

Files:

• drv/bus/usb/usbhid/kbd.h (added)
• drv/bus/usb/usbhid/kbd/layout.h (added)
• drv/bus/usb/usbhid/kbd/main.c (added)
• drv/bus/usb/usbhid/layout.h (added)
• drv/bus/usb/usbmast/scsi.h (added)
• srv/fs/mfs/mfs_ops.c (modified) (7 diffs)
• srv/hid/input/include/sun.h (added)
• srv/hid/input/port/dummy.c (added)
• srv/hid/input/port/sgcn.c (added)
• srv/hid/input/port/sun.c (added)
• srv/hid/input/port/z8530.c (added)

uspace/srv/fs/mfs/mfs_ops.c

@@ -145 +145 @@
 {
         enum cache_mode cmode;
-        struct mfs_superblock *sb;
-        struct mfs3_superblock *sb3;
-        struct mfs_sb_info *sbi;
-        struct mfs_instance *instance;
+        struct mfs_superblock *sb = NULL;
+        struct mfs3_superblock *sb3 = NULL;
+        struct mfs_sb_info *sbi = NULL;
+        struct mfs_instance *instance = NULL;
         bool native, longnames;
         mfs_version_t version;
@@ -168 +168 @@
         sbi = malloc(sizeof(*sbi));
         if (!sbi) {
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
@@ -175 +175 @@
         instance = malloc(sizeof(*instance));
         if (!instance) {
-                free(sbi);
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
@@ -184 +183 @@
         sb = malloc(MFS_SUPERBLOCK_SIZE);
         if (!sb) {
-                free(instance);
-                free(sbi);
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
         /* Read the superblock */
         rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 2, sb);
-        if (rc != EOK) {
-                free(instance);
-                free(sbi);
-                free(sb);
-                block_fini(service_id);
-                return rc;
-        }
+        if (rc != EOK)
+                goto out_error;
 
         sb3 = (struct mfs3_superblock *) sb;
@@ -211 +203 @@
                 /*Not recognized*/
                 mfsdebug("magic number not recognized\n");
-                free(instance);
-                free(sbi);
-                free(sb);
-                block_fini(service_id);
-                return ENOTSUP;
+                rc = ENOTSUP;
+                goto out_error;
         }
 
@@ -260 +249 @@
                                     MFS_MAX_NAME_LEN;
         }
+
+        if (sbi->log2_zone_size != 0) {
+                /* In MFS, file space is allocated per zones.
+                 * Zones are a collection of consecutive blocks on disk.
+                 *
+                 * The current MFS implementation supports only filesystems
+                 * where the size of a zone is equal to the
+                 * size of a block.
+                 */
+                rc = ENOTSUP;
+                goto out_error;
+        }
+
         sbi->itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
-
-        free(sb);
 
         rc = block_cache_init(service_id, sbi->block_size, 0, cmode);
         if (rc != EOK) {
-                free(instance);
-                free(sbi);
-                free(sb);
+                mfsdebug("block cache initialization failed\n");
                 block_cache_fini(service_id);
-                block_fini(service_id);
-                mfsdebug("block cache initialization failed\n");
-                return EINVAL;
+                rc = EINVAL;
+                goto out_error;
         }
 
@@ -295 +292 @@
         *linkcnt = 1;
 
+        free(sb);
+
         return mfs_node_put(fn);
+
+out_error:
+        block_fini(service_id);
+        if (sb)
+                free(sb);
+        if (sbi)
+                free(sbi);
+        if(instance)
+                free(instance);
+        return rc;
 }