Changeset dd0c8a0 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -548 +548 @@
         int found = 0;
 
-        list_foreach(mtab_list, cur) {
-                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
-                    link);
-
+        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (str_cmp(mtab_ent->mp, mp) == 0) {
                         list_remove(&mtab_ent->link);
@@ -1371 +1368 @@
         async_answer_1(callid, EOK, mtab_size);
 
-        list_foreach(mtab_list, cur) {
-                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
-                    link);
-
+        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 rc = ENOTSUP;
 
@@ -1418 +1412 @@
 }
 
+void vfs_statfs(ipc_callid_t rid, ipc_call_t *request)
+{
+        char *path;
+        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
+        if (rc != EOK) {
+                async_answer_0(rid, rc);
+                return;
+        }
+        
+        ipc_callid_t callid;
+        if (!async_data_read_receive(&callid, NULL)) {
+                free(path);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        vfs_lookup_res_t lr;
+        fibril_rwlock_read_lock(&namespace_rwlock);
+        rc = vfs_lookup_internal(path, L_NONE, &lr, NULL);
+        free(path);
+        if (rc != EOK) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
+                async_answer_0(callid, rc);
+                async_answer_0(rid, rc);
+                return;
+        }
+        vfs_node_t *node = vfs_node_get(&lr);
+        if (!node) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
+                return;
+        }
+
+        fibril_rwlock_read_unlock(&namespace_rwlock);
+
+        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+        
+        aid_t msg;
+        msg = async_send_3(exch, VFS_OUT_STATFS, node->service_id,
+            node->index, false, NULL);
+        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        
+        vfs_exchange_release(exch);
+        
+        sysarg_t rv;
+        async_wait_for(msg, &rv);
+
+        async_answer_0(rid, rv);
+
+        vfs_node_put(node);
+}
+
 /**
  * @}