Changeset 5a2b765 in mainline

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

Files:

• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/sys/statfs.h (modified) (1 diff)
• fs/libfs.c (modified) (4 diffs)

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 */
 };
 

uspace/lib/fs/libfs.c

@@ -43 +43 @@
 #include <dirent.h>
 #include <mem.h>
+#include <str.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <stdlib.h>
 #include <fibril_synch.h>
+#include <ipc/vfs.h>
 
 #define on_error(rc, action) \
@@ -72 +74 @@
 static vfs_out_ops_t *vfs_out_ops = NULL;
 static libfs_ops_t *libfs_ops = NULL;
+
+static char fs_name[FS_NAME_MAXLEN + 1];
 
 static void libfs_link(libfs_ops_t *, fs_handle_t, ipc_callid_t,
@@ -394 +398 @@
         vfs_out_ops = vops;
         libfs_ops = lops;
+
+        str_cpy(fs_name, sizeof(fs_name), info->name);
 
         /*
@@ -817 +823 @@
         memset(&st, 0, sizeof(struct statfs));
 
+        str_cpy(st.fs_name, sizeof(st.fs_name), fs_name);
+
         if (ops->size_block != NULL) {
                 rc = ops->size_block(service_id, &st.f_bsize);