Changeset cf982ff in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2014-01-28T21:08:38Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

0dd022ec

Parents:

476f62c (diff), 5828554 (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 libext4 fixes

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (13 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -259 +259 @@
         rc = ext4fs_node_get_core(rfn, eparent->instance, inode);
         if (rc != EOK)
-                return rc;
-        
+                goto exit;
+
+exit:
+        ;
+
         /* Destroy search result structure */
-        return ext4_directory_destroy_result(&result);
+        int const rc2 = ext4_directory_destroy_result(&result);
+        return rc == EOK ? rc2 : rc;
 }
 
@@ -1002 +1006 @@
         *lnkcnt = 1;
         
-        ext4fs_node_put(root_node);
-        
-        return EOK;
+        return ext4fs_node_put(root_node);
 }
 
@@ -1093 +1095 @@
         }
         
-        ext4_filesystem_put_inode_ref(inode_ref);
-        
-        return rc;
+        int const rc2 = ext4_filesystem_put_inode_ref(inode_ref);
+        
+        return rc == EOK ? rc2 : rc;
 }
 
@@ -1268 +1270 @@
                 memset(buffer, 0, bytes);
                 
-                async_data_read_finalize(callid, buffer, bytes);
+                rc = async_data_read_finalize(callid, buffer, bytes);
                 *rbytes = bytes;
                 
                 free(buffer);
-                return EOK;
+                return rc;
         }
         
@@ -1284 +1286 @@
         
         assert(offset_in_block + bytes <= block_size);
-        async_data_read_finalize(callid, block->data + offset_in_block, bytes);
+        rc = async_data_read_finalize(callid, block->data + offset_in_block, bytes);
+        if (rc != EOK) {
+                block_put(block);
+                return rc;
+        }
         
         rc = block_put(block);
@@ -1316 +1322 @@
         size_t len;
         if (!async_data_write_receive(&callid, &len)) {
-                ext4fs_node_put(fn);
-                async_answer_0(callid, EINVAL);
-                return EINVAL;
+                rc = EINVAL;
+                async_answer_0(callid, rc);
+                goto exit;
         }
         
@@ -1341 +1347 @@
             &fblock);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
-                return rc;
+                goto exit;
         }
         
@@ -1359 +1364 @@
                                     &fblock, true);
                                 if (rc != EOK) {
-                                        ext4fs_node_put(fn);
                                         async_answer_0(callid, rc);
-                                        return rc;
+                                        goto exit;
                                 }
                         }
@@ -1368 +1372 @@
                             &fblock, false);
                         if (rc != EOK) {
-                                ext4fs_node_put(fn);
                                 async_answer_0(callid, rc);
-                                return rc;
+                                goto exit;
                         }
                 } else {
                         rc = ext4_balloc_alloc_block(inode_ref, &fblock);
                         if (rc != EOK) {
-                                ext4fs_node_put(fn);
                                 async_answer_0(callid, rc);
-                                return rc;
+                                goto exit;
                         }
                         
@@ -1384 +1386 @@
                         if (rc != EOK) {
                                 ext4_balloc_free_block(inode_ref, fblock);
-                                ext4fs_node_put(fn);
                                 async_answer_0(callid, rc);
-                                return rc;
+                                goto exit;
                         }
                 }
@@ -1398 +1399 @@
         rc = block_get(&write_block, service_id, fblock, flags);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
-                return rc;
-        }
-        
-        if (flags == BLOCK_FLAGS_NOREAD)
+                goto exit;
+        }
+        
+        if (flags == BLOCK_FLAGS_NOREAD) {
                 memset(write_block->data, 0, block_size);
-        
+                write_block->dirty = true;
+        }
+
         rc = async_data_write_finalize(callid, write_block->data +
             (pos % block_size), bytes);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
-                return rc;
-        }
-        
-        write_block->dirty = true;
-        
+                block_put(write_block);
+                goto exit;
+        }
+
         rc = block_put(write_block);
-        if (rc != EOK) {
-                ext4fs_node_put(fn);
-                return rc;
-        }
-        
+        if (rc != EOK)
+                goto exit;
+
         /* Do some counting */
         uint32_t old_inode_size = ext4_inode_get_size(fs->superblock,
@@ -1428 +1426 @@
                 inode_ref->dirty = true;
         }
-        
+
         *nsize = ext4_inode_get_size(fs->superblock, inode_ref->inode);
         *wbytes = bytes;
-        
-        return ext4fs_node_put(fn);
+
+exit:
+        ;
+
+        int const rc2 = ext4fs_node_put(fn);
+        return rc == EOK ? rc2 : rc;
 }
 
@@ -1458 +1460 @@
         
         rc = ext4_filesystem_truncate_inode(inode_ref, new_size);
-        ext4fs_node_put(fn);
-        
-        return rc;
+        int const rc2 = ext4fs_node_put(fn);
+        
+        return rc == EOK ? rc2 : rc;
 }