Changeset 5a2b765 in mainline for uspace/lib/c

Timestamp:

2017-03-16T17:17:31Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

39c3b7f9

Parents:

8ffedd8

Message:

Add the FS name field to struct statfs

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (1 diff)
• include/sys/statfs.h (modified) (1 diff)

uspace/lib/c/generic/vfs/vfs.c

@@ -1115 +1115 @@
         link_initialize(&ent->link);
         str_cpy(ent->mp, sizeof(ent->mp), path);
-        str_cpy(ent->fs_name, sizeof(ent->fs_name), "fixme");
         ent->service_id = stat->service_id;
+
+        struct statfs stfs;
+        if (statfs(path, &stfs) == EOK)
+                str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
+        else
+                str_cpy(ent->fs_name, sizeof(ent->fs_name), "?");
         
         list_append(&ent->link, mtab_list);

uspace/lib/c/include/sys/statfs.h

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <ipc/vfs.h>
 
 struct statfs { 
-        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 */
+        char fs_name[FS_NAME_MAXLEN + 1];
+        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 */
 };