Changeset b5b5d84 in mainline

Timestamp:

2017-03-30T18:58:28Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23a0368

Parents:

fe91f66

Message:

Rename statfs() to vfs_statfs_path() and provide relativized vfs_statfs()

Location:

uspace

Files:

• app/df/df.c (modified) (2 diffs)
• lib/c/generic/vfs/vfs.c (modified) (3 diffs)
• lib/c/include/sys/statfs.h (deleted)
• lib/c/include/vfs/vfs.h (modified) (2 diffs)
• lib/fs/libfs.c (modified) (1 diff)

uspace/app/df/df.c

@@ -40 +40 @@
 #include <stdint.h>
 #include <getopt.h>
-#include <sys/statfs.h>
 #include <errno.h>
 #include <adt/list.h>
@@ -124 +123 @@
         print_header();
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
-                if (statfs(mtab_ent->mp, &st) == 0) {
+                if (vfs_statfs_path(mtab_ent->mp, &st) == 0) {
                         print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
                 } else {

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

@@ -44 +44 @@
 #include <stdio.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -1084 +1083 @@
 
         struct statfs stfs;
-        if (statfs(path, &stfs) == EOK)
+        if (vfs_statfs_path(path, &stfs) == EOK)
                 str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
         else
@@ -1164 +1163 @@
 /** Get filesystem statistics.
  *
+ * @param file File located on the queried file system
+ * @param st Buffer for storing information
+ * @return 0 on success. On error -1 is returned and errno is set.
+ */
+int vfs_statfs(int file, struct statfs *st)
+{
+        sysarg_t rc, ret;
+        aid_t req;
+
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_1(exch, VFS_IN_STATFS, file, NULL);
+        rc = async_data_read_start(exch, (void *) st, sizeof(*st));
+
+        vfs_exchange_end(exch);
+        async_wait_for(req, &ret);
+
+        rc = (ret != EOK ? ret : rc);
+
+        return rc;
+}
+/** Get filesystem statistics.
+ *
  * @param path Mount point path
  * @param st Buffer for storing information
- * @return 0 on success. On error -1 is returned and errno is set.
- */
-int statfs(const char *path, struct statfs *st)
-{
-        int fd = vfs_lookup(path, 0);
-        if (fd < 0) {
-                errno = fd;
-                return -1;
-        }
-        
-        sysarg_t rc, ret;
-        aid_t req;
-
-        async_exch_t *exch = vfs_exchange_begin();
-
-        req = async_send_1(exch, VFS_IN_STATFS, fd, NULL);
-        rc = async_data_read_start(exch, (void *) st, sizeof(*st));
-
-        vfs_exchange_end(exch);
-        async_wait_for(req, &ret);
-        close(fd);
-
-        rc = (ret != EOK ? ret : rc);
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-
-        return 0;
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_statfs_path(const char *path, struct statfs *st)
+{
+        int file = vfs_lookup(path, 0);
+        if (file < 0)
+                return file;
+        
+        int rc = vfs_statfs(file, st);
+
+        close(file);
+
+        return rc; 
 }
 

uspace/lib/c/include/vfs/vfs.h

@@ -49 +49 @@
 };
 
+struct statfs { 
+        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 */
+};
+
 extern char *vfs_absolutize(const char *, size_t *);
 
@@ -72 +79 @@
 extern int vfs_root(void);
 extern void vfs_root_set(int);
+extern int vfs_statfs(int, struct statfs *);
+extern int vfs_statfs_path(const char *, struct statfs *);
 
 int vfs_mount(int, const char *, service_id_t, const char *, unsigned, unsigned, int *);

uspace/lib/fs/libfs.c

@@ -45 +45 @@
 #include <str.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <stdlib.h>
 #include <fibril_synch.h>
 #include <ipc/vfs.h>
+#include <vfs/vfs.h>
 
 #define on_error(rc, action) \