Changeset bd5f3b7 in mainline for uspace/srv/vfs/vfs_node.c

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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_node.c (modified) (9 diffs)

uspace/srv/vfs/vfs_node.c

@@ -116 +116 @@
                 unsigned long key[] = {
                         [KEY_FS_HANDLE] = node->fs_handle,
-                        [KEY_DEV_HANDLE] = node->devmap_handle,
+                        [KEY_DEV_HANDLE] = node->service_id,
                         [KEY_INDEX] = node->index
                 };
@@ -138 +138 @@
                 async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
                 sysarg_t rc = async_req_2_0(exch, VFS_OUT_DESTROY,
-                    (sysarg_t) node->devmap_handle, (sysarg_t)node->index);
+                    (sysarg_t) node->service_id, (sysarg_t)node->index);
                 
                 assert(rc == EOK);
@@ -160 +160 @@
         unsigned long key[] = {
                 [KEY_FS_HANDLE] = node->fs_handle,
-                [KEY_DEV_HANDLE] = node->devmap_handle,
+                [KEY_DEV_HANDLE] = node->service_id,
                 [KEY_INDEX] = node->index
         };
@@ -184 +184 @@
         unsigned long key[] = {
                 [KEY_FS_HANDLE] = result->triplet.fs_handle,
-                [KEY_DEV_HANDLE] = result->triplet.devmap_handle,
+                [KEY_DEV_HANDLE] = result->triplet.service_id,
                 [KEY_INDEX] = result->triplet.index
         };
@@ -200 +200 @@
                 memset(node, 0, sizeof(vfs_node_t));
                 node->fs_handle = result->triplet.fs_handle;
-                node->devmap_handle = result->triplet.devmap_handle;
+                node->service_id = result->triplet.service_id;
                 node->index = result->triplet.index;
                 node->size = result->size;
@@ -252 +252 @@
         vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
         return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) &&
-            (node->devmap_handle == key[KEY_DEV_HANDLE]) &&
+            (node->service_id == key[KEY_DEV_HANDLE]) &&
             (node->index == key[KEY_INDEX]);
 }
@@ -264 +264 @@
         unsigned refcnt;
         fs_handle_t fs_handle;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 };
 
@@ -273 +273 @@
 
         if ((node->fs_handle == rd->fs_handle) &&
-            (node->devmap_handle == rd->devmap_handle))
+            (node->service_id == rd->service_id))
                 rd->refcnt += node->refcnt;
 }
 
 unsigned
-vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle)
+vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, service_id_t service_id)
 {
         struct refcnt_data rd = {
                 .refcnt = 0,
                 .fs_handle = fs_handle,
-                .devmap_handle = devmap_handle
+                .service_id = service_id
         };
 
@@ -291 +291 @@
 
         return rd.refcnt;
+}
+
+
+/** Perform a remote node open operation.
+ *
+ * @return EOK on success or an error code from errno.h.
+ *
+ */
+int vfs_open_node_remote(vfs_node_t *node)
+{
+        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
+            (sysarg_t) node->service_id, (sysarg_t) node->index, &answer);
+        
+        vfs_exchange_release(exch);
+
+        sysarg_t rc;
+        async_wait_for(req, &rc);
+        
+        return rc;
 }