Changeset 5930e3f in mainline for uspace/lib

Timestamp:

2013-07-09T06:06:37Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

951f32ce

Parents:

11baebb

Message:

Implement size_block function for ext4fs.
Fix typo in libfs VFS_OUT_STATFS operation.
Remove all debug code.

Location:

uspace/lib

Files:

• c/generic/vfs/vfs.c (modified) (3 diffs)
• fs/libfs.c (modified) (3 diffs)

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

@@ -893 +893 @@
 }
 
-#include <stdio.h>
 int statfs(const char *path, struct statfs *statfs)
 {
@@ -904 +903 @@
         if (!pa)
                 return ENOMEM;
-        
         async_exch_t *exch = vfs_exchange_begin();
         
@@ -918 +916 @@
                         return (int) rc_orig;
         }
-        printf("TRACE: send VFS_IN_STATFS\n");
-        rc = async_data_read_start(exch, statfs, sizeof(struct statfs));
-        if (rc != EOK) {
-                printf("TRACE: error reply\n");
+        rc = async_data_read_start(exch, (void *) statfs, sizeof(struct statfs));
+        if (rc != EOK) {
                 vfs_exchange_end(exch);
                 free(pa);

uspace/lib/fs/libfs.c

@@ -75 +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 +220 @@
         async_answer_0(rid, rc);
 }
-#include<stdio.h>
+
 static void vfs_out_statfs(ipc_callid_t rid, ipc_call_t *req)
-{       
-        printf("TRACE: vfs_out_statfs\n");
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        
-        fs_node_t *fn;
-        int rc = libfs_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 stat))) {
-                libfs_ops->node_put(fn);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        struct statfs statfs;
-        memset(&statfs, 0, sizeof(struct statfs));
-        
-        statfs.f_bsize = libfs_ops->size_block(service_id);
-
-        libfs_ops->node_put(fn);
-        
-        async_data_read_finalize(callid, &statfs, sizeof(struct statfs));
-        async_answer_0(rid, EOK);
-}
-
+{
+        libfs_statfs(libfs_ops, reg.fs_handle, rid, req);
+}
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -865 +839 @@
 }
 
+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)    
+                statfs.f_bsize = ops->size_block(service_id);
+        
+        ops->node_put(fn);
+        
+        async_data_read_finalize(callid, &statfs, sizeof(struct statfs));
+        async_answer_0(rid, EOK);
+}
+
+
 /** Open VFS triplet.
  *