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

_vm_map_file() did in fact not work correctly, but the main problem was

Browse Source 
vfs_get_vnode_cache() which did not acquire an extra reference to the
cache_ref when the cache had to be created.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17693 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-06-01 18:21:21 +00:00
parent a9fa017d82
commit acac7c6834
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3085,11 +3085,12 @@ vfs_get_vnode_cache(void *_vnode, vm_cache_ref **_cache, bool allocate)
vnode->busy = wasBusy;
} else
status = B_BAD_VALUE;
} else
vm_cache_acquire_ref(vnode->cache);
}
if (status == B_OK)
if (status == B_OK) {
vm_cache_acquire_ref(vnode->cache);
*_cache = vnode->cache;
}
mutex_unlock(&sVnodeMutex);
return status;

9
src/system/kernel/vm/vm.cpp
View File

@ -1179,14 +1179,17 @@ _vm_map_file(team_id aid, const char *name, void **_address, uint32 addressSpec,
status = map_backing_store(addressSpace, cacheRef->cache->store, _address,
offset, size, addressSpec, 0, protection, mapping, &area, name);
if (status < B_OK || mapping == REGION_PRIVATE_MAP) {
// map_backing_store() cannot know we no longer need the ref
vm_cache_release_ref(cacheRef);
}
if (status < B_OK)
goto err2;
goto err1;
vm_put_address_space(addressSpace);
return area->id;
err2:
vm_cache_release_ref(cacheRef);
err1:
vm_put_address_space(addressSpace);
return status;