Changeset 6a44ee4 in mainline for uspace/srv/vfs/vfs_node.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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) (2 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,
@@ -116 +119 @@
                         [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->devmap_handle, (sysarg_t)node->index);
+                
                 assert(rc == EOK);
-                vfs_release_phone(node->fs_handle, phone);
+                vfs_exchange_release(exch);
         }
+        
         if (free_vfs_node)
                 free(node);