Changes in uspace/lib/ext4/libext4_extent.c [bd5d4e1:38542dc] in mainline

File:

• uspace/lib/ext4/libext4_extent.c (modified) (11 diffs)

uspace/lib/ext4/libext4_extent.c

@@ -371 +371 @@
     uint32_t *fblock)
 {
-        int rc;
         /* Compute bound defined by i-node size */
         uint64_t inode_size =
@@ -401 +400 @@
                 uint64_t child = ext4_extent_index_get_leaf(index);
                 
-                if (block != NULL) {
-                        rc = block_put(block);
-                        if (rc != EOK)
-                                return rc;
-                }
-                
-                rc = block_get(&block, inode_ref->fs->device, child,
+                if (block != NULL)
+                        block_put(block);
+                
+                int rc = block_get(&block, inode_ref->fs->device, child,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK)
@@ -433 +429 @@
         /* Cleanup */
         if (block != NULL)
-                rc = block_put(block);
-        
-        return rc;
+                block_put(block);
+        
+        return EOK;
 }
 
@@ -509 +505 @@
         
 cleanup:
-        ;
-
-        int rc2 = EOK;
-
         /*
          * Put loaded blocks
@@ -518 +510 @@
          */
         for (uint16_t i = 1; i < tmp_path->depth; ++i) {
-                if (tmp_path[i].block) {
-                        rc2 = block_put(tmp_path[i].block);
-                        if (rc == EOK && rc2 != EOK)
-                                rc = rc2;
-                }
+                if (tmp_path[i].block)
+                        block_put(tmp_path[i].block);
         }
         
@@ -605 +594 @@
                 return rc;
         
-        return ext4_balloc_free_block(inode_ref, fblock);
+        ext4_balloc_free_block(inode_ref, fblock);
+        
+        return EOK;
 }
 
@@ -730 +721 @@
         
 cleanup:
-        ;
-
-        int rc2 = EOK;
-
         /*
          * Put loaded blocks
@@ -739 +726 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block) {
-                        rc2 = block_put(path[i].block);
-                        if (rc == EOK && rc2 != EOK)
-                                rc = rc2;
-                }
+                if (path[i].block)
+                        block_put(path[i].block);
         }
         
@@ -794 +778 @@
                         
                         /* Put back not modified old block */
-                        rc = block_put(path_ptr->block);
-                        if (rc != EOK) {
-                                ext4_balloc_free_block(inode_ref, fblock);
-                                block_put(block);
-                                return rc;
-                        }
+                        block_put(path_ptr->block);
                         
                         /* Initialize newly allocated block and remember it */
@@ -1082 +1061 @@
         
 finish:
-        ;
-
-        int rc2 = EOK;
-
         /* Set return values */
         *iblock = new_block_idx;
@@ -1095 +1070 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block) {
-                        rc2 = block_put(path[i].block);
-                        if (rc == EOK && rc2 != EOK)
-                                rc = rc2;
-                }
+                if (path[i].block)
+                        block_put(path[i].block);
         }