Changeset 8b863a62 in mainline for uspace/lib/ext4/libext4_filesystem.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_filesystem.c (modified) (4 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -39 +39 @@
 #include <errno.h>
 #include <malloc.h>
+#include <ipc/vfs.h>
 #include "libext4.h"
 
@@ -796 +797 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)
@@ -840 +844 @@
                                 }
                                 
-                                block_put(subblock);
+                                rc = block_put(subblock);
+                                if (rc != EOK)
+                                        return rc;
                         }
                         
@@ -850 +856 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)