Changeset e8f0158 in mainline

Timestamp:

2013-07-11T21:17:42Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

d0a1e9b6

Parents:

67632f7

Message:

Change statfs structure fields [64bit].
Add total_block and free_block operation for ext4fs.

Location:

uspace

Files:

• app/df/df.c (modified) (3 diffs)
• lib/c/include/sys/statfs.h (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (3 diffs)

uspace/app/df/df.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <sys/statfs.h>
 #include <errno.h>
@@ -47 +48 @@
 #define HEADER_TABLE "Filesystem    512-blocks      Used      Available  Used%  Mounted on"
 
-#define PERCENTAGE(x, tot) ((long) (100L * (x) / (tot)))  
+#define PERCENTAGE(x, tot) ((unsigned long long) (100L * (x) / (tot)))  
 
 int main(int argc, char *argv[])
@@ -60 +61 @@
                     link);
                 statfs(mtab_ent->mp, &st);
-                printf("block size:%ld\n", st.f_bsize);
-                printf("%13s %15lld %9lld %9lld %3ld%% %s\n", 
+                printf("block size:%lu\n", (unsigned long)st.f_bsize);
+                printf("%13s %15llu %9llu %9llu %3llu%% %s\n", 
                         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,
+                        (unsigned long long) st.f_blocks * st.f_bsize,
+                        (unsigned long long) (st.f_blocks - st.f_bfree) * st.f_bsize,
+                        (unsigned long long) 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/c/include/sys/statfs.h

@@ -39 +39 @@
 
 struct statfs { 
-        short   f_type;     /* type of file system  */
-        long    f_bsize;    /* fundamental file system block size */
-        long    f_blocks;   /* total data blocks in file system */
-        long    f_bfree;    /* free blocks in fs */
+        uint32_t    f_type;     /* type of file system  */
+        uint32_t    f_bsize;    /* fundamental file system block size */
+        uint64_t    f_blocks;   /* total data blocks in file system */
+        uint64_t    f_bfree;    /* free blocks in fs */
 };
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -102 +102 @@
 static service_id_t ext4fs_service_get(fs_node_t *node);
 static long ext4fs_size_block(service_id_t);
+static long ext4fs_total_block(service_id_t);
+static long ext4fs_free_block(service_id_t);
 
 /* Static variables */
@@ -847 +849 @@
         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;
+}
+
+long ext4fs_total_block(service_id_t service_id)
+{
+        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;
+        uint32_t block_count = ext4_superblock_get_blocks_count(sb);
+
+        return block_count;
+}
+
+long ext4fs_free_block(service_id_t service_id)
+{
+        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;
+        uint32_t block_count = ext4_superblock_get_free_blocks_count(sb);
+
+        return block_count;
 }
 
@@ -872 +906 @@
         .is_file = ext4fs_is_file,
         .service_get = ext4fs_service_get,
-        .size_block = ext4fs_size_block
+        .size_block = ext4fs_size_block,
+        .total_block = ext4fs_total_block,
+        .free_block = ext4fs_free_block
 };