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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (8 diffs)

uspace/srv/vfs/vfs_node.c

@@ -104 +104 @@
         bool free_vfs_node = false;
         bool free_fs_node = false;
-
-        fibril_mutex_lock(&nodes_mutex);
+        
+        fibril_mutex_lock(&nodes_mutex);
+        
         if (node->refcnt-- == 1) {
+                
                 /*
                  * We are dropping the last reference to this node.
                  * Remove it from the VFS node hash table.
                  */
+                
                 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
                 };
+                
                 hash_table_remove(&nodes, key, 3);
                 free_vfs_node = true;
+                
                 if (!node->lnkcnt)
                         free_fs_node = true;
         }
-        fibril_mutex_unlock(&nodes_mutex);
-
+        
+        fibril_mutex_unlock(&nodes_mutex);
+        
         if (free_fs_node) {
-                /* 
+                
+                /*
                  * The node is not visible in the file system namespace.
                  * Free up its resources.
                  */
-                int phone = vfs_grab_phone(node->fs_handle);
-                sysarg_t rc;
-                rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-                    (sysarg_t)node->devmap_handle, (sysarg_t)node->index);
+                
+                async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+                sysarg_t rc = async_req_2_0(exch, VFS_OUT_DESTROY,
+                    (sysarg_t) node->service_id, (sysarg_t)node->index);
+                
                 assert(rc == EOK);
-                vfs_release_phone(node->fs_handle, phone);
+                vfs_exchange_release(exch);
         }
+        
         if (free_vfs_node)
                 free(node);
@@ -151 +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
         };
@@ -175 +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
         };
@@ -191 +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;
@@ -243 +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]);
 }
@@ -255 +264 @@
         unsigned refcnt;
         fs_handle_t fs_handle;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 };
 
@@ -264 +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
         };
 
@@ -282 +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;
 }