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

Timestamp:

2013-07-29T11:44:35Z (12 years ago)

Author:

Jiri Zarevucky <zarevucky.jiri@…>

Branches:

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

Children:

677745a

Parents:

9e9b168

Message:

Make the server oblivious to the link count. It is just another source of potential problems. Also clean up some confusion with file types and node refcount.

File:

• uspace/srv/vfs/vfs_node.c (modified) (4 diffs)

uspace/srv/vfs/vfs_node.c

@@ -106 +106 @@
 void vfs_node_delref(vfs_node_t *node)
 {
-        bool free_vfs_node = false;
-        bool free_fs_node = false;
-        
-        fibril_mutex_lock(&nodes_mutex);
-        
-        if (node->refcnt-- == 1) {
+        bool free_node = false;
+        
+        fibril_mutex_lock(&nodes_mutex);
+        
+        node->refcnt--;
+        if (node->refcnt == 0) {
                 
                 /*
@@ -119 +119 @@
                 
                 hash_table_remove_item(&nodes, &node->nh_link);
-                free_vfs_node = true;
-                
-                if (!node->lnkcnt)
-                        free_fs_node = true;
+                free_node = true;
         }
         
         fibril_mutex_unlock(&nodes_mutex);
         
-        if (free_fs_node) {
-                
+        if (free_node) {
                 /*
-                 * The node is not visible in the file system namespace.
-                 * Free up its resources.
+                 * DESTROY will free up the file's resources if there are no more hard links.
                  */
                 
                 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);
+                async_msg_2(exch, VFS_OUT_DESTROY,
+                        (sysarg_t) node->service_id, (sysarg_t)node->index);
                 vfs_exchange_release(exch);
+
+                free(node);
         }
-        
-        if (free_vfs_node)
-                free(node);
 }
 
@@ -190 +182 @@
                 node->index = result->triplet.index;
                 node->size = result->size;
-                node->lnkcnt = result->lnkcnt;
                 node->type = result->type;
                 fibril_rwlock_initialize(&node->contents_rwlock);
@@ -196 +187 @@
         } else {
                 node = hash_table_get_inst(tmp, vfs_node_t, nh_link);
-                if (node->type == VFS_NODE_UNKNOWN &&
-                    result->type != VFS_NODE_UNKNOWN) {
-                        /* Upgrade the node type. */
-                        node->type = result->type;
-                }
         }
-
-        assert(node->size == result->size || node->type != VFS_NODE_FILE);
-        assert(node->lnkcnt == result->lnkcnt);
-        assert(node->type == result->type || result->type == VFS_NODE_UNKNOWN);
 
         _vfs_node_addref(node);