Changeset 29e7cc7 in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.c

Timestamp:

2025-04-18T15:14:10Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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 branch 'upstream/master' into helenraid

File:

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

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -38 +38 @@
 
 #include "tmpfs.h"
-#include "../../vfs/vfs.h"
 #include <macros.h>
 #include <stdint.h>
@@ -159 +158 @@
 }
 
-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);