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

Timestamp:

2008-11-29T15:39:24Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dfd77382

Parents:

abd36f7

Message:

Hold the namespace_rwlock during readdir().

File:

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

uspace/srv/vfs/vfs_node.c

@@ -176 +176 @@
                 node->size = result->size;
                 node->lnkcnt = result->lnkcnt;
+                node->type = result->type;
                 link_initialize(&node->nh_link);
                 rwlock_initialize(&node->contents_rwlock);
@@ -181 +182 @@
         } else {
                 node = hash_table_get_instance(tmp, vfs_node_t, nh_link);       
+                if (node->type == VFS_NODE_UNKNOWN &&
+                    result->type != VFS_NODE_UNKNOWN) {
+                        /* Upgrade the node type. */
+                        node->type = result->type;
+                }
         }
 
         assert(node->size == result->size);
         assert(node->lnkcnt == result->lnkcnt);
+        assert(node->type == result->type || result->type == VFS_NODE_UNKNOWN);
 
         _vfs_node_addref(node);