Changes in uspace/lib/fs/libfs.c [3dd148d:feeac0d] in mainline

File:

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

uspace/lib/fs/libfs.c

@@ -45 +45 @@
 #include <mem.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <stdlib.h>
 
@@ -75 +74 @@
 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)
@@ -221 +219 @@
 }
 
-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)
 {
@@ -282 +276 @@
                 case VFS_OUT_SYNC:
                         vfs_out_sync(callid, &call);
-                        break;
-                case VFS_OUT_STATFS:
-                        vfs_out_statfs(callid, &call);
                         break;
                 default:
@@ -834 +825 @@
         
         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))) {
-                ops->node_put(fn);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        struct statfs statfs;
-        memset(&statfs, 0, sizeof(struct statfs));
-
-        if (NULL != ops->size_block) {  
-                rc = ops->size_block(service_id, &statfs.f_bsize);
-                if (rc != EOK) goto error;
-        }
-
-        if (NULL != ops->total_block_count) {
-                rc = ops->total_block_count(service_id, &statfs.f_blocks);
-                if (rc != EOK) goto error;
-        }
-
-        if (NULL != ops->free_block_count) {
-                rc = ops->free_block_count(service_id, &statfs.f_bfree);
-                if (rc != EOK) goto error;
-        }
-
-        ops->node_put(fn);
-        async_data_read_finalize(callid, &statfs, 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.
@@ -942 +882 @@
 
         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);
@@ -968 +905 @@
 {
         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;
@@ -985 +919 @@
 {
         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);