Changeset 8b863a62 in mainline for uspace/lib/ext4/libext4_directory_index.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/ext4/libext4_directory_index.c (modified) (5 diffs)

uspace/lib/ext4/libext4_directory_index.c

@@ -527 +527 @@
                 
                 /* Don't forget to put old block (prevent memory leak) */
-                block_put(p->block);
+                rc = block_put(p->block);
+                if (rc != EOK)
+                        return rc;
                 
                 p->block = block;
@@ -553 +555 @@
         /* Load direct block 0 (index root) */
         uint32_t root_block_addr;
+        int rc2;
         int rc = ext4_filesystem_get_inode_data_block_index(inode_ref, 0,
             &root_block_addr);
@@ -620 +623 @@
                 
                 /* Not found, leave untouched */
-                block_put(leaf_block);
+                rc2 = block_put(leaf_block);
+                if (rc2 != EOK)
+                        goto cleanup;
                 
                 if (rc != ENOENT)
@@ -628 +633 @@
                 rc = ext4_directory_dx_next_block(inode_ref, hinfo.hash,
                     dx_block, &dx_blocks[0]);
-                if (rc < 0)
+                if (rc != EOK)
                         goto cleanup;
+
         } while (rc == ENOENT);
         
@@ -640 +646 @@
         
         while (tmp <= dx_block) {
-                block_put(tmp->block);
+                rc2 = block_put(tmp->block);
+                if (rc == EOK && rc2 != EOK)
+                        rc = rc2;
                 ++tmp;
         }