Changeset 0c2d9bb in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/mfs/mfs_ops.c (modified) (4 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -64 +64 @@
 static int mfs_check_sanity(struct mfs_sb_info *sbi);
 static bool is_power_of_two(uint32_t n);
+static int mfs_size_block(service_id_t service_id, uint32_t *size);
+static int mfs_total_block_count(service_id_t service_id, uint64_t *count);
+static int mfs_free_block_count(service_id_t service_id, uint64_t *count);
 
 static hash_table_t open_nodes;
@@ -84 +87 @@
         .destroy = mfs_destroy_node,
         .has_children = mfs_has_children,
-        .lnkcnt_get = mfs_lnkcnt_get
+        .lnkcnt_get = mfs_lnkcnt_get,
+        .size_block = mfs_size_block,
+        .total_block_count = mfs_total_block_count,
+        .free_block_count = mfs_free_block_count
 };
 
@@ -210 +216 @@
         sbi->isearch = 0;
         sbi->zsearch = 0;
+        sbi->nfree_zones_valid = false;
+        sbi->nfree_zones = 0;
 
         if (version == MFS_VERSION_V3) {
@@ -1129 +1137 @@
 }
 
+static int
+mfs_size_block(service_id_t service_id, uint32_t *size)
+{
+        struct mfs_instance *inst;
+        int rc;
+
+        rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+        
+        *size = inst->sbi->block_size;
+
+        return EOK;
+}
+
+static int
+mfs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        struct mfs_instance *inst;
+        int rc;
+        
+        rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+        
+        *count = (uint64_t) MFS_BMAP_SIZE_BITS(inst->sbi, BMAP_ZONE);
+
+        return EOK;
+}
+
+static int
+mfs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        uint32_t block_free;
+        
+        struct mfs_instance *inst;
+        int rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        struct mfs_sb_info *sbi = inst->sbi;
+
+        if (!sbi->nfree_zones_valid) {
+                /* The cached number of free zones is not valid,
+                 * we need to scan the bitmap to retrieve the
+                 * current value.
+                 */
+
+                rc = mfs_count_free_zones(inst, &block_free);
+                if (rc != EOK)
+                        return rc;
+
+                sbi->nfree_zones = block_free;
+                sbi->nfree_zones_valid = true;
+        }
+
+        *count = sbi->nfree_zones;
+
+        return rc;
+}
+
 vfs_out_ops_t mfs_ops = {
         .mounted = mfs_mounted,