Changeset 24607

Timestamp:

03/27/08 05:48:33 (8 months ago)

Author:

axeld

Message:

* Reverted r22315 as far as free_vnode() is concerned: removing the

vnode from the hash before putting it caused all sorts of problems.

* For example, BFS would trim its preallocations when the vnode is put;

if someone would read that same vnode after it had been removed, but
before BFS could trim it, it would read the old vnode which still
seemed to own the blocks which would subsequently be freed.

* This fixes bug #1914, and should also fix bug #1956.

Files:

• haiku/trunk/src/system/kernel/fs/vfs.cpp (modified) (2 diffs)

haiku/trunk/src/system/kernel/fs/vfs.cpp

@@ -692 +692 @@
         vnode->ref_count = 2;
 
-        // The file system has removed the resources of the vnode now, so we can
-        // make it available again (and remove the busy vnode from the hash)
-        mutex_lock(&sVnodeMutex);
-        hash_remove(sVnodeTable, vnode);
-        mutex_unlock(&sVnodeMutex);
-
         // TODO: Usually, when the vnode is unreferenced, no one can get hold of the
         // cache either (i.e. no one can get a cache reference while we're deleting
@@ -713 +707 @@
                 }
         }
+
+        // The file system has removed the resources of the vnode now, so we can
+        // make it available again (and remove the busy vnode from the hash)
+        mutex_lock(&sVnodeMutex);
+        hash_remove(sVnodeTable, vnode);
+        mutex_unlock(&sVnodeMutex);
 
         // if we have a vm_cache attached, remove it