i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm_store::fault() is now called with having the vm_cache_ref locked, so it shouldn't

Browse Source 
be locked again here...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19805 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-01-15 10:24:22 +00:00
parent d60fa6c96f
commit d8a7f74053
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm_store_device.c
+2 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2006, Axel Dörfler, [email protected]. * Copyright 2004-2007, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -61,6 +61,7 @@ device_write(struct vm_store *store, off_t offset, const iovec *vecs, size_t cou
return B_OK; return B_OK;
} }
/** this fault handler should take over the page fault routine and map the page in /** this fault handler should take over the page fault routine and map the page in
* *
* setup: the cache that this store is part of has a ref being held and will be * setup: the cache that this store is part of has a ref being held and will be
@@ -76,7 +77,6 @@ device_fault(struct vm_store *_store, struct vm_address_space *aspace, off_t off
vm_area *area; vm_area *area;
// figure out which page needs to be mapped where // figure out which page needs to be mapped where
mutex_lock(&cache_ref->lock);
map->ops->lock(map); map->ops->lock(map);
// cycle through all of the regions that map this cache and map the page in // cycle through all of the regions that map this cache and map the page in
@@ -97,8 +97,6 @@ device_fault(struct vm_store *_store, struct vm_address_space *aspace, off_t off
} }
map->ops->unlock(map); map->ops->unlock(map);
mutex_unlock(&cache_ref->lock);
return B_OK; return B_OK;
} }