Changeset bca408b in mainline

Timestamp:

2010-01-27T20:10:31Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

95e6c4f

Parents:

2314381 (diff), 1715b6af (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 TMPFS fix.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -160 +160 @@
         tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
             nh_link);
-        return (nodep->index == key[NODES_KEY_INDEX] &&
-            nodep->dev_handle == key[NODES_KEY_DEV]);
+        
+        switch (keys) {
+        case 1:
+                return (nodep->dev_handle == key[NODES_KEY_DEV]);
+        case 2: 
+                return ((nodep->dev_handle == key[NODES_KEY_DEV]) &&
+                    (nodep->index == key[NODES_KEY_INDEX]));
+        default:
+                abort();
+        }
 }