Changes in uspace/srv/vfs/vfs_node.c [5bcd5b7:4e00f87] in mainline

File:

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

uspace/srv/vfs/vfs_node.c

@@ -45 +45 @@
 #include <async.h>
 #include <errno.h>
-#include <macros.h>
 
 /** Mutex protecting the VFS node hash table. */
@@ -107 +106 @@
 void vfs_node_delref(vfs_node_t *node)
 {
-        bool free_node = false;
-        
-        fibril_mutex_lock(&nodes_mutex);
-        
-        node->refcnt--;
-        if (node->refcnt == 0) {
+        bool free_vfs_node = false;
+        bool free_fs_node = false;
+        
+        fibril_mutex_lock(&nodes_mutex);
+        
+        if (node->refcnt-- == 1) {
                 
                 /*
@@ -120 +119 @@
                 
                 hash_table_remove_item(&nodes, &node->nh_link);
-                free_node = true;
+                free_vfs_node = true;
+                
+                if (!node->lnkcnt)
+                        free_fs_node = true;
         }
         
         fibril_mutex_unlock(&nodes_mutex);
         
-        if (free_node) {
+        if (free_fs_node) {
+                
                 /*
-                 * DESTROY will free up the file's resources if there are no more hard links.
+                 * The node is not visible in the file system namespace.
+                 * Free up its resources.
                  */
                 
                 async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-                async_msg_2(exch, VFS_OUT_DESTROY,
-                        (sysarg_t) node->service_id, (sysarg_t)node->index);
+                sysarg_t rc = async_req_2_0(exch, VFS_OUT_DESTROY,
+                    (sysarg_t) node->service_id, (sysarg_t)node->index);
+                
+                assert(rc == EOK);
                 vfs_exchange_release(exch);
-
+        }
+        
+        if (free_vfs_node)
                 free(node);
-        }
 }
 
@@ -183 +190 @@
                 node->index = result->triplet.index;
                 node->size = result->size;
+                node->lnkcnt = result->lnkcnt;
                 node->type = result->type;
                 fibril_rwlock_initialize(&node->contents_rwlock);
@@ -188 +196 @@
         } 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);
-        fibril_mutex_unlock(&nodes_mutex);
-
-        return node;
-}
-
-vfs_node_t *vfs_node_peek(vfs_lookup_res_t *result)
-{
-        vfs_node_t *node = NULL;
-
-        fibril_mutex_lock(&nodes_mutex);
-        ht_link_t *tmp = hash_table_find(&nodes, &result->triplet);
-        if (tmp) {
-                node = hash_table_get_inst(tmp, vfs_node_t, nh_link);
-        }
         fibril_mutex_unlock(&nodes_mutex);
 
@@ -315 +318 @@
 }
 
-int64_t vfs_node_get_size(vfs_node_t *node)
-{
-        if (node->size == -1) {
-                sysarg_t sz1 = 0;
-                sysarg_t sz2 = 0;
-                
-                async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-                (void) async_req_2_2(exch, VFS_OUT_GET_SIZE,
-                        node->service_id, node->index, &sz1, &sz2);
-                vfs_exchange_release(exch);
-                
-                node->size = MERGE_LOUP32(sz1, sz2);
-        }
-        return node->size;
-}
-
-bool vfs_node_has_children(vfs_node_t *node)
-{
-        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        int rc = async_req_2_0(exch, VFS_OUT_IS_EMPTY, node->service_id, node->index);
-        vfs_exchange_release(exch);
-        return rc == ENOTEMPTY;
-}
-
 /**
  * @}