Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [5e801dc:6f5995f] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (6 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
@@ -38 +39 @@
 
 #include "tmpfs.h"
-#include "../../vfs/vfs.h"
 #include <macros.h>
 #include <stdint.h>
@@ -159 +159 @@
 }
 
-static bool nodes_key_equal(const void *key_arg, const ht_link_t *item)
+static bool nodes_key_equal(const void *key_arg, size_t hash,
+    const ht_link_t *item)
 {
         tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link);
@@ -189 +190 @@
 
 /** TMPFS nodes hash table operations. */
-hash_table_ops_t nodes_ops = {
+const hash_table_ops_t nodes_ops = {
         .hash = nodes_hash,
         .key_hash = nodes_key_hash,
@@ -276 +277 @@
         ht_link_t *lnk = hash_table_find(&nodes, &key);
 
-        if (lnk) {
-                tmpfs_node_t *nodep;
-                nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
-                *rfn = FS_NODE(nodep);
-        } else {
+        if (lnk == NULL) {
                 *rfn = NULL;
-        }
+                return EBADF;
+        }
+
+        tmpfs_node_t *nodep;
+        nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
+        *rfn = FS_NODE(nodep);
         return EOK;
 }
@@ -320 +322 @@
 
         rc = tmpfs_root_get(&rootfn, service_id);
-        assert(rc == EOK);
-        if (!rootfn)
+        assert(rc == EOK || rc == EBADF);
+        if (rootfn == NULL)
                 nodep->index = TMPFS_SOME_ROOT;
         else