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

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

uspace/srv/vfs/vfs_node.c

@@ -38 +38 @@
 #include "vfs.h"
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <fibril_synch.h>
 #include <adt/hash_table.h>
@@ -242 +242 @@
 {
         vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
-        return (node->fs_handle == key[KEY_FS_HANDLE]) &&
+        return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) &&
             (node->dev_handle == key[KEY_DEV_HANDLE]) &&
             (node->index == key[KEY_INDEX]);