Changeset 67632f7 in mainline

Timestamp:

2013-07-11T20:03:39Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

e8f0158

Parents:

e6edc8d1

Message:

Add total_block and free_block operation.
Implement total_block and free_block operation for mfs.
Fix df application output.

Location:

uspace

Files:

• app/df/df.c (modified) (1 diff)
• lib/fs/libfs.c (modified) (1 diff)
• lib/fs/libfs.h (modified) (1 diff)
• srv/fs/mfs/mfs_ops.c (modified) (3 diffs)

uspace/app/df/df.c

@@ -64 +64 @@
                         mtab_ent->fs_name,
                         (long long) st.f_blocks * st.f_bsize,
+                        (long long) (st.f_blocks - st.f_bfree) * st.f_bsize,
                         (long long) st.f_bfree * st.f_bsize,
-                        (long long) (st.f_blocks - st.f_bfree) * st.f_bsize,
                         (st.f_blocks)?PERCENTAGE(st.f_blocks - st.f_bfree, st.f_blocks):0L,
                         mtab_ent->mp);

uspace/lib/fs/libfs.c

@@ -864 +864 @@
         if (NULL != ops->size_block)    
                 statfs.f_bsize = ops->size_block(service_id);
+        if (NULL != ops->total_block)
+                statfs.f_blocks = ops->total_block(service_id);
+        if (NULL != ops->free_block)
+                statfs.f_bfree = ops->free_block(service_id);
         
         ops->node_put(fn);

uspace/lib/fs/libfs.h

@@ -94 +94 @@
         service_id_t (* service_get)(fs_node_t *);
         long (* size_block)(service_id_t);
+        long (* total_block)(service_id_t);
+        long (* free_block)(service_id_t);
 } libfs_ops_t;
 

uspace/srv/fs/mfs/mfs_ops.c

@@ -65 +65 @@
 static bool is_power_of_two(uint32_t n);
 static long mfs_size_block(service_id_t service_id);
+static long mfs_total_block(service_id_t service_id);
+static long mfs_free_block(service_id_t service_id);
 
 static hash_table_t open_nodes;
@@ -86 +88 @@
         .has_children = mfs_has_children,
         .lnkcnt_get = mfs_lnkcnt_get,
-        .size_block = mfs_size_block
+        .size_block = mfs_size_block,
+        .total_block = mfs_total_block,
+        .free_block = mfs_free_block
 };
 
@@ -1142 +1146 @@
         if (NULL == inst)
                 return ENOENT;
+        
         block_size = inst->sbi->block_size;
+
         return block_size;
+}
+
+static long
+mfs_total_block(service_id_t service_id)
+{
+        long block_total;
+        
+        struct mfs_instance *inst;
+        int rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+        
+        block_total = inst->sbi->nzones;
+
+        return block_total;
+}
+
+static long
+mfs_free_block(service_id_t service_id)
+{
+        uint32_t block_free;
+        
+        struct mfs_instance *inst;
+        int rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        mfs_count_free_zones(inst, &block_free);
+
+        return (long)block_free;
 }