Changes in uspace/srv/fs/ext4fs/ext4fs_ops.c [2f591127:cc8044e] in mainline

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