diff options
| author | alc <alc@FreeBSD.org> | 2003-04-22 14:26:02 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2003-04-22 14:26:02 +0000 |
| commit | eb6d5ae625a29830f8e83be636c27f74c9d7d929 (patch) | |
| tree | 75cc338f6efd2de68155d4cd367e21c13f02fc2a /sys/vm/vm_page.c | |
| parent | 2788f60153cebca561d25b478e62eb2267c1398c (diff) | |
| download | FreeBSD-src-eb6d5ae625a29830f8e83be636c27f74c9d7d929.zip FreeBSD-src-eb6d5ae625a29830f8e83be636c27f74c9d7d929.tar.gz | |
Revision 1.246 should have also included
- Weaken the assertion in vm_page_insert() to require Giant only if the
vm_object isn't locked.
Reported by: "Ilmar S. Habibulin" <ilmar@watson.org>
Diffstat (limited to 'sys/vm/vm_page.c')
| -rw-r--r-- | sys/vm/vm_page.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8ce52ab..d5b8a5c 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -532,6 +532,8 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) { vm_page_t root; + if (!VM_OBJECT_LOCKED(object)) + GIANT_REQUIRED; if (m->object != NULL) panic("vm_page_insert: already inserted"); @@ -541,7 +543,6 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) m->object = object; m->pindex = pindex; - mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED); /* * Now link into the object's ordered list of backed pages. */ |
