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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (4 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;
@@ -836 +836 @@
         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 +902 @@
         .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
 };