Changeset 532f53d in mainline for uspace/lib/ext4

Timestamp:

2013-11-20T21:47:41Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e5a1ace3

Parents:

2764497

Message:

ext4: return the error code to the caller in case something fails.

Location:

uspace/lib/ext4

Files:

• libext4_extent.c (modified) (10 diffs)
• libext4_filesystem.c (modified) (3 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 =
@@ -400 +401 @@
                 uint64_t child = ext4_extent_index_get_leaf(index);
                 
-                if (block != NULL)
-                        block_put(block);
-                
-                int rc = block_get(&block, inode_ref->fs->device, child,
+                if (block != NULL) {
+                        rc = block_put(block);
+                        if (rc != EOK)
+                                return rc;
+                }
+                
+                rc = block_get(&block, inode_ref->fs->device, child,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK)
@@ -429 +433 @@
         /* Cleanup */
         if (block != NULL)
-                block_put(block);
-        
-        return EOK;
+                rc = block_put(block);
+        
+        return rc;
 }
 
@@ -505 +509 @@
         
 cleanup:
+        ;
+
+        int rc2 = EOK;
+
         /*
          * Put loaded blocks
@@ -510 +518 @@
          */
         for (uint16_t i = 1; i < tmp_path->depth; ++i) {
-                if (tmp_path[i].block)
-                        block_put(tmp_path[i].block);
+                if (tmp_path[i].block) {
+                        rc2 = block_put(tmp_path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         
@@ -594 +605 @@
                 return rc;
         
-        ext4_balloc_free_block(inode_ref, fblock);
-        
-        return EOK;
+        return ext4_balloc_free_block(inode_ref, fblock);
 }
 
@@ -721 +730 @@
         
 cleanup:
+        ;
+
+        int rc2 = EOK;
+
         /*
          * Put loaded blocks
@@ -726 +739 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block)
-                        block_put(path[i].block);
+                if (path[i].block) {
+                        rc2 = block_put(path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         
@@ -1061 +1077 @@
         
 finish:
+        ;
+
+        int rc2 = EOK;
+
         /* Set return values */
         *iblock = new_block_idx;
@@ -1070 +1090 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block)
-                        block_put(path[i].block);
+                if (path[i].block) {
+                        rc2 = block_put(path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         

uspace/lib/ext4/libext4_filesystem.c

@@ -797 +797 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)
@@ -841 +844 @@
                                 }
                                 
-                                block_put(subblock);
+                                rc = block_put(subblock);
+                                if (rc != EOK)
+                                        return rc;
                         }
                         
@@ -851 +856 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)