Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/vfs: Fix mismatched frees of vnodes.

Browse Source 
Regression from yesterday's commit. Fixes #17642.
Hopefully this is all of them.
This commit is contained in:
Augustin Cavalier 2022-03-10 09:48:42 -05:00
parent 585ce471d1
commit 4027df884e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/kernel/fs/vfs.cpp
View File

@ -967,7 +967,7 @@ create_new_vnode_and_lock(dev_t mountID, ino_t vnodeID, struct vnode*& _vnode,
rw_lock_write_lock(&sVnodeLock); rw_lock_write_lock(&sVnodeLock);
struct vnode* existingVnode = lookup_vnode(mountID, vnodeID); struct vnode* existingVnode = lookup_vnode(mountID, vnodeID);
if (existingVnode != NULL) { if (existingVnode != NULL) {
free(vnode); object_cache_free(sVnodeCache, vnode, 0);
_vnode = existingVnode; _vnode = existingVnode;
_nodeCreated = false; _nodeCreated = false;
return B_OK; return B_OK;
@ -979,7 +979,7 @@ create_new_vnode_and_lock(dev_t mountID, ino_t vnodeID, struct vnode*& _vnode,
if (!vnode->mount || vnode->mount->unmounting) { if (!vnode->mount || vnode->mount->unmounting) {
rw_lock_read_unlock(&sMountLock); rw_lock_read_unlock(&sMountLock);
rw_lock_write_unlock(&sVnodeLock); rw_lock_write_unlock(&sVnodeLock);
free(vnode); object_cache_free(sVnodeCache, vnode, 0);
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
} }
@ -1261,7 +1261,7 @@ restart:
remove_vnode_from_mount_list(vnode, vnode->mount); remove_vnode_from_mount_list(vnode, vnode->mount);
rw_lock_write_unlock(&sVnodeLock); rw_lock_write_unlock(&sVnodeLock);
free(vnode); object_cache_free(sVnodeCache, vnode, 0);
return status; return status;
} }
@ -3837,7 +3837,7 @@ restart:
locker.Lock(); locker.Lock();
sVnodeTable->Remove(vnode); sVnodeTable->Remove(vnode);
remove_vnode_from_mount_list(vnode, vnode->mount); remove_vnode_from_mount_list(vnode, vnode->mount);
free(vnode); object_cache_free(sVnodeCache, vnode, 0);
} }
} else { } else {
// we still hold the write lock -- mark the node unbusy and published // we still hold the write lock -- mark the node unbusy and published