Changeset 0773396 in mainline for uspace/lib/fs/libfs.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/fs/libfs.c (modified) (10 diffs)

uspace/lib/fs/libfs.c

@@ -45 +45 @@
 #include <mem.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <stdlib.h>
 
@@ -74 +75 @@
 static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
     ipc_call_t *);
+static void libfs_statfs(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 
 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)
@@ -219 +221 @@
 }
 
+static void vfs_out_statfs(ipc_callid_t rid, ipc_call_t *req)
+{
+        libfs_statfs(libfs_ops, reg.fs_handle, rid, req);
+}
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -276 +282 @@
                 case VFS_OUT_SYNC:
                         vfs_out_sync(callid, &call);
+                        break;
+                case VFS_OUT_STATFS:
+                        vfs_out_statfs(callid, &call);
                         break;
                 default:
@@ -797 +806 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        
+
         fs_node_t *fn;
         int rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -811 +820 @@
                 return;
         }
-        
+
         struct stat stat;
         memset(&stat, 0, sizeof(struct stat));
-        
+
         stat.fs_handle = fs_handle;
         stat.service_id = service_id;
@@ -823 +832 @@
         stat.size = ops->size_get(fn);
         stat.service = ops->service_get(fn);
-        
+
         ops->node_put(fn);
-        
+
+
         async_data_read_finalize(callid, &stat, sizeof(struct stat));
         async_answer_0(rid, EOK);
 }
+
+void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+    ipc_call_t *request)
+{
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+
+        fs_node_t *fn;
+        int rc = ops->node_get(&fn, service_id, index);
+        on_error(rc, answer_and_return(rid, rc));
+
+        ipc_callid_t callid;
+        size_t size;
+        if ((!async_data_read_receive(&callid, &size)) ||
+            (size != sizeof(struct statfs))) {
+                goto error;
+        }
+
+        struct statfs st;
+        memset(&st, 0, sizeof(struct statfs));
+
+        if (ops->size_block != NULL) {
+                rc = ops->size_block(service_id, &st.f_bsize);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        if (ops->total_block_count != NULL) {
+                rc = ops->total_block_count(service_id, &st.f_blocks);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        if (ops->free_block_count != NULL) {
+                rc = ops->free_block_count(service_id, &st.f_bfree);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        ops->node_put(fn);
+        async_data_read_finalize(callid, &st, sizeof(struct statfs));
+        async_answer_0(rid, EOK);
+        return;
+
+error:
+        ops->node_put(fn);
+        async_answer_0(callid, EINVAL);
+        async_answer_0(rid, EINVAL);
+}
+
 
 /** Open VFS triplet.
@@ -882 +942 @@
 
         fibril_mutex_lock(&instances_mutex);
-        list_foreach(instances_list, link) {
-                fs_instance_t *cur = list_get_instance(link, fs_instance_t,
-                    link);
-
+        list_foreach(instances_list, link, fs_instance_t, cur) {
                 if (cur->service_id == service_id) {
                         fibril_mutex_unlock(&instances_mutex);
@@ -908 +965 @@
 {
         fibril_mutex_lock(&instances_mutex);
-        list_foreach(instances_list, link) {
-                fs_instance_t *inst = list_get_instance(link, fs_instance_t,
-                    link);
-
+        list_foreach(instances_list, link, fs_instance_t, inst) {
                 if (inst->service_id == service_id) {
                         *idp = inst->data;
@@ -925 +979 @@
 {
         fibril_mutex_lock(&instances_mutex);
-        list_foreach(instances_list, link) {
-                fs_instance_t *inst = list_get_instance(link, fs_instance_t,
-                    link);
-
+        list_foreach(instances_list, link, fs_instance_t, inst) {
                 if (inst->service_id == service_id) {
                         list_remove(&inst->link);