Changes in uspace/lib/ext4/libext4_filesystem.c [eb94d84:532f53d] in mainline

File:

• uspace/lib/ext4/libext4_filesystem.c (modified) (3 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -53 +53 @@
     enum cache_mode cmode)
 {
-        ext4_superblock_t *temp_superblock = NULL;
-
         fs->device = service_id;
-
+        
         /* Initialize block library (4096 is size of communication channel) */
         int rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096);
         if (rc != EOK)
-                goto err;
-
+                return rc;
+        
         /* Read superblock from device to memory */
+        ext4_superblock_t *temp_superblock;
         rc = ext4_superblock_read_direct(fs->device, &temp_superblock);
-        if (rc != EOK)
-                goto err_1;
-
+        if (rc != EOK) {
+                block_fini(fs->device);
+                return rc;
+        }
+        
         /* Read block size from superblock and check */
         uint32_t block_size = ext4_superblock_get_block_size(temp_superblock);
         if (block_size > EXT4_MAX_BLOCK_SIZE) {
-                rc = ENOTSUP;
-                goto err_1;
-        }
-
+                block_fini(fs->device);
+                return ENOTSUP;
+        }
+        
         /* Initialize block caching by libblock */
         rc = block_cache_init(service_id, block_size, 0, cmode);
-        if (rc != EOK)
-                goto err_1;
-
+        if (rc != EOK) {
+                block_fini(fs->device);
+                return rc;
+        }
+        
         /* Compute limits for indirect block levels */
         uint32_t block_ids_per_block = block_size / sizeof(uint32_t);
@@ -89 +92 @@
                     fs->inode_blocks_per_level[i];
         }
-
+        
         /* Return loaded superblock */
         fs->superblock = temp_superblock;
-
+        
         uint16_t state = ext4_superblock_get_state(fs->superblock);
-
+        
         if (((state & EXT4_SUPERBLOCK_STATE_VALID_FS) !=
             EXT4_SUPERBLOCK_STATE_VALID_FS) ||
             ((state & EXT4_SUPERBLOCK_STATE_ERROR_FS) ==
             EXT4_SUPERBLOCK_STATE_ERROR_FS)) {
-                rc = ENOTSUP;
-                goto err_2;
-        }
-
+                block_cache_fini(fs->device);
+                block_fini(fs->device);
+                return ENOTSUP;
+        }
+        
         /* Mark system as mounted */
         ext4_superblock_set_state(fs->superblock, EXT4_SUPERBLOCK_STATE_ERROR_FS);
         rc = ext4_superblock_write_direct(fs->device, fs->superblock);
-        if (rc != EOK)
-                goto err_2;
-
+        if (rc != EOK) {
+                block_cache_fini(fs->device);
+                block_fini(fs->device);
+                return rc;
+        }
+        
         uint16_t mnt_count = ext4_superblock_get_mount_count(fs->superblock);
         ext4_superblock_set_mount_count(fs->superblock, mnt_count + 1);
-
+        
         return EOK;
-
-err_2:
-        block_cache_fini(fs->device);
-err_1:
-        block_fini(fs->device);
-err:
-        if (temp_superblock)
-                ext4_superblock_release(temp_superblock);
-        return rc;
 }
 
@@ -847 +845 @@
                                 
                                 rc = block_put(subblock);
-                                if (rc != EOK) {
-                                        block_put(block);
+                                if (rc != EOK)
                                         return rc;
-                                }
                         }