Changes in uspace/srv/fs/cdfs/cdfs_ops.c [5e801dc:48cc66f] in mainline

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (8 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -297 +298 @@
 }
 
-static bool nodes_key_equal(const void *k, const ht_link_t *item)
+static bool nodes_key_equal(const void *k, size_t hash, const ht_link_t *item)
 {
         cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link);
@@ -323 +324 @@
 
 /** Nodes hash table operations */
-static hash_table_ops_t nodes_ops = {
+static const hash_table_ops_t nodes_ops = {
         .hash = nodes_hash,
         .key_hash = nodes_key_hash,
@@ -340 +341 @@
 
         ht_link_t *link = hash_table_find(&nodes, &key);
-        if (link) {
-                cdfs_node_t *node =
-                    hash_table_get_inst(link, cdfs_node_t, nh_link);
-
-                *rfn = FS_NODE(node);
-        } else
+        if (!link) {
                 *rfn = NULL;
-
+                return EBADF;
+        }
+
+        cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link);
+        *rfn = FS_NODE(node);
         return EOK;
 }
@@ -394 +394 @@
         errno_t rc = cdfs_root_get(&rootfn, fs->service_id);
 
-        assert(rc == EOK);
+        assert(rc == EOK || rc == EBADF);
 
         if (!rootfn)
@@ -1093 +1093 @@
 
         /* Initialize the block layer */
-        errno_t rc = block_init(service_id, BLOCK_SIZE);
+        errno_t rc = block_init(service_id);
         if (rc != EOK)
                 return rc;
@@ -1150 +1150 @@
 {
         /* Initialize the block layer */
-        errno_t rc = block_init(service_id, BLOCK_SIZE);
+        errno_t rc = block_init(service_id);
         if (rc != EOK)
                 return rc;
@@ -1353 +1353 @@
                 cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link);
 
-                if (!node->opened) {
+                /* Remove closed, but root node is always in memory. */
+                if (!node->opened && node->index != 0) {
                         hash_table_remove_item(&nodes, item);