Changeset 8b863a62 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.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/srv/fs/ext4fs/ext4fs_ops.c (modified) (17 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -101 +101 @@
 static bool ext4fs_is_file(fs_node_t *node);
 static service_id_t ext4fs_service_get(fs_node_t *node);
+static int ext4fs_size_block(service_id_t, uint32_t *);
+static int ext4fs_total_block_count(service_id_t, uint64_t *);
+static int ext4fs_free_block_count(service_id_t, uint64_t *);
 
 /* Static variables */
@@ -194 +197 @@
         }
         
-        list_foreach(instance_list, link) {
-                ext4fs_instance_t *tmp =
-                    list_get_instance(link, ext4fs_instance_t, link);
-                
+        list_foreach(instance_list, link, ext4fs_instance_t, tmp) {
                 if (tmp->service_id == service_id) {
                         *inst = tmp;
@@ -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;
 }
 
@@ -836 +840 @@
         ext4fs_node_t *enode = EXT4FS_NODE(fn);
         return enode->instance->service_id;
+}
+
+int ext4fs_size_block(service_id_t service_id, uint32_t *size)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *size = ext4_superblock_get_block_size(sb);
+
+        return EOK;
+}
+
+int ext4fs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *count = ext4_superblock_get_blocks_count(sb);
+
+        return EOK;
+}
+
+int ext4fs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *count = ext4_superblock_get_free_blocks_count(sb);
+
+        return EOK;
 }
 
@@ -857 +906 @@
         .is_directory = ext4fs_is_directory,
         .is_file = ext4fs_is_file,
-        .service_get = ext4fs_service_get
+        .service_get = ext4fs_service_get,
+        .size_block = ext4fs_size_block,
+        .total_block_count = ext4fs_total_block_count,
+        .free_block_count = ext4fs_free_block_count
 };
 
@@ -954 +1006 @@
         *lnkcnt = 1;
         
-        ext4fs_node_put(root_node);
-        
-        return EOK;
+        return ext4fs_node_put(root_node);
 }
 
@@ -1045 +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;
 }
 
@@ -1220 +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;
         }
         
@@ -1236 +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);
@@ -1268 +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;
         }
         
@@ -1293 +1347 @@
             &fblock);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
-                return rc;
+                goto exit;
         }
         
@@ -1311 +1364 @@
                                     &fblock, true);
                                 if (rc != EOK) {
-                                        ext4fs_node_put(fn);
                                         async_answer_0(callid, rc);
-                                        return rc;
+                                        goto exit;
                                 }
                         }
@@ -1320 +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;
                         }
                         
@@ -1336 +1386 @@
                         if (rc != EOK) {
                                 ext4_balloc_free_block(inode_ref, fblock);
-                                ext4fs_node_put(fn);
                                 async_answer_0(callid, rc);
-                                return rc;
+                                goto exit;
                         }
                 }
@@ -1350 +1399 @@
         rc = block_get(&write_block, service_id, fblock, flags);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
-                return rc;
+                goto exit;
         }
         
         if (flags == BLOCK_FLAGS_NOREAD)
                 memset(write_block->data, 0, block_size);
-        
+
         rc = async_data_write_finalize(callid, write_block->data +
             (pos % block_size), bytes);
         if (rc != EOK) {
-                ext4fs_node_put(fn);
-                return rc;
-        }
-        
+                block_put(write_block);
+                goto exit;
+        }
+
         write_block->dirty = true;
-        
+
         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,
@@ -1380 +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;
 }
 
@@ -1410 +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;
 }