From 557f6a25dabeba0a3a6a1c2ad7e9d6b250de37c6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 18 Mar 2009 13:12:34 +0000 Subject: [PATCH] PutVNode(): Switch order of put_vnode() and _DecrementVNodeCount(). After the put_vnode() might be removed from our map, if that was the last reference to the node, so _DecrementVNodeCount() would emit an error message -- harmless but annoying. :-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29586 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../file_systems/userlandfs/kernel_add_on/Volume.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp index 3c9e2ee9e3..4202539ac3 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp @@ -312,10 +312,13 @@ status_t Volume::PutVNode(ino_t vnid) { PRINT(("put_vnode(%ld, %lld)\n", GetID(), vnid)); - status_t error = put_vnode(fFSVolume, vnid); - if (error == B_OK) - _DecrementVNodeCount(vnid); - return error; + // Decrement the count first. We might not have another chance, since + // put_vnode() could put the last reference, thus causing the node to be + // removed from our map. This is all not very dramatic, but this way we + // avoid an erroneous error message from _DecrementVNodeCount(). + _DecrementVNodeCount(vnid); + + return put_vnode(fFSVolume, vnid); }