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

Timestamp:

2013-07-29T15:15:49Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

736b07b

Parents:

a1c95da

Message:

Change stafs function operation to allow correct error handling.

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (5 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 uint32_t ext4fs_size_block(service_id_t);
-static uint64_t ext4fs_total_block_count(service_id_t);
-static uint64_t ext4fs_free_block_count(service_id_t);
+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 */
@@ -841 +841 @@
 }
 
-uint32_t ext4fs_size_block(service_id_t service_id)
+int ext4fs_size_block(service_id_t service_id, uint32_t *size)
 {
         ext4fs_instance_t *inst;
@@ -847 +847 @@
         if (rc != EOK)
                 return rc;
+
         if (NULL == inst)
                 return ENOENT;
 
         ext4_superblock_t *sb = inst->filesystem->superblock;
-        uint32_t block_size = ext4_superblock_get_block_size(sb);
-
-        return block_size;
-}
-
-uint64_t ext4fs_total_block_count(service_id_t service_id)
+        *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;
@@ -862 +863 @@
         if (rc != EOK)
                 return rc;
+
         if (NULL == inst)
                 return ENOENT;
 
         ext4_superblock_t *sb = inst->filesystem->superblock;
-        uint64_t block_count = ext4_superblock_get_blocks_count(sb);
-
-        return block_count;
-}
-
-uint64_t ext4fs_free_block_count(service_id_t service_id)
+        *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;
@@ -881 +883 @@
 
         ext4_superblock_t *sb = inst->filesystem->superblock;
-        uint64_t block_count = ext4_superblock_get_free_blocks_count(sb);
-
-        return block_count;
+        *count = ext4_superblock_get_free_blocks_count(sb);
+
+        return EOK;
 }