Rename VM_OBJECT_LOCK(), VM_OBJECT_UNLOCK() and VM_OBJECT_TRYLOCK() to

their "write" versions.

Sponsored by:	EMC / Isilon storage division

1 files changed, 15 insertions, 15 deletions

diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 593a37d..9f602b7 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -234,7 +234,7 @@ kmem_alloc_attr(vm_map_t map, vm_size_t size, int flags, vm_paddr_t low,
 	vm_map_insert(map, object, offset, addr, addr + size, VM_PROT_ALL,
 	    VM_PROT_ALL, 0);
 	pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY;
-	VM_OBJECT_LOCK(object);
+	VM_OBJECT_WLOCK(object);
 	end_offset = offset + size;
 	for (; offset < end_offset; offset += PAGE_SIZE) {
 		tries = 0;
@@ -242,12 +242,12 @@ retry:
 		m = vm_page_alloc_contig(object, OFF_TO_IDX(offset), pflags, 1,
 		    low, high, PAGE_SIZE, 0, memattr);
 		if (m == NULL) {
-			VM_OBJECT_UNLOCK(object);
+			VM_OBJECT_WUNLOCK(object);
 			if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) {
 				vm_map_unlock(map);
 				vm_pageout_grow_cache(tries, low, high);
 				vm_map_lock(map);
-				VM_OBJECT_LOCK(object);
+				VM_OBJECT_WLOCK(object);
 				tries++;
 				goto retry;
 			}
@@ -266,7 +266,7 @@ retry:
 			pmap_zero_page(m);
 		m->valid = VM_PAGE_BITS_ALL;
 	}
-	VM_OBJECT_UNLOCK(object);
+	VM_OBJECT_WUNLOCK(object);
 	vm_map_unlock(map);
 	vm_map_wire(map, addr, addr + size, VM_MAP_WIRE_SYSTEM |
 	    VM_MAP_WIRE_NOHOLES);
@@ -303,18 +303,18 @@ kmem_alloc_contig(vm_map_t map, vm_size_t size, int flags, vm_paddr_t low,
 	vm_map_insert(map, object, offset, addr, addr + size, VM_PROT_ALL,
 	    VM_PROT_ALL, 0);
 	pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY;
-	VM_OBJECT_LOCK(object);
+	VM_OBJECT_WLOCK(object);
 	tries = 0;
 retry:
 	m = vm_page_alloc_contig(object, OFF_TO_IDX(offset), pflags,
 	    atop(size), low, high, alignment, boundary, memattr);
 	if (m == NULL) {
-		VM_OBJECT_UNLOCK(object);
+		VM_OBJECT_WUNLOCK(object);
 		if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) {
 			vm_map_unlock(map);
 			vm_pageout_grow_cache(tries, low, high);
 			vm_map_lock(map);
-			VM_OBJECT_LOCK(object);
+			VM_OBJECT_WLOCK(object);
 			tries++;
 			goto retry;
 		}
@@ -328,7 +328,7 @@ retry:
 			pmap_zero_page(m);
 		m->valid = VM_PAGE_BITS_ALL;
 	}
-	VM_OBJECT_UNLOCK(object);
+	VM_OBJECT_WUNLOCK(object);
 	vm_map_unlock(map);
 	vm_map_wire(map, addr, addr + size, VM_MAP_WIRE_SYSTEM |
 	    VM_MAP_WIRE_NOHOLES);
@@ -488,7 +488,7 @@ kmem_back(vm_map_t map, vm_offset_t addr, vm_size_t size, int flags)
 
 	pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED;
 
-	VM_OBJECT_LOCK(kmem_object);
+	VM_OBJECT_WLOCK(kmem_object);
 	for (i = 0; i < size; i += PAGE_SIZE) {
 retry:
 		m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), pflags);
@@ -500,7 +500,7 @@ retry:
 		 */
 		if (m == NULL) {
 			if ((flags & M_NOWAIT) == 0) {
-				VM_OBJECT_UNLOCK(kmem_object);
+				VM_OBJECT_WUNLOCK(kmem_object);
 				entry->eflags |= MAP_ENTRY_IN_TRANSITION;
 				vm_map_unlock(map);
 				VM_WAIT;
@@ -510,7 +510,7 @@ retry:
 				    MAP_ENTRY_IN_TRANSITION,
 				    ("kmem_back: volatile entry"));
 				entry->eflags &= ~MAP_ENTRY_IN_TRANSITION;
-				VM_OBJECT_LOCK(kmem_object);
+				VM_OBJECT_WLOCK(kmem_object);
 				goto retry;
 			}
 			/* 
@@ -526,7 +526,7 @@ retry:
 				vm_page_unwire(m, 0);
 				vm_page_free(m);
 			}
-			VM_OBJECT_UNLOCK(kmem_object);
+			VM_OBJECT_WUNLOCK(kmem_object);
 			vm_map_delete(map, addr, addr + size);
 			return (KERN_NO_SPACE);
 		}
@@ -536,7 +536,7 @@ retry:
 		KASSERT((m->oflags & VPO_UNMANAGED) != 0,
 		    ("kmem_malloc: page %p is managed", m));
 	}
-	VM_OBJECT_UNLOCK(kmem_object);
+	VM_OBJECT_WUNLOCK(kmem_object);
 
 	/*
 	 * Mark map entry as non-pageable.  Repeat the assert.
@@ -556,7 +556,7 @@ retry:
 	/*
 	 * Loop thru pages, entering them in the pmap.
 	 */
-	VM_OBJECT_LOCK(kmem_object);
+	VM_OBJECT_WLOCK(kmem_object);
 	for (i = 0; i < size; i += PAGE_SIZE) {
 		m = vm_page_lookup(kmem_object, OFF_TO_IDX(offset + i));
 		/*
@@ -566,7 +566,7 @@ retry:
 		    TRUE);
 		vm_page_wakeup(m);
 	}
-	VM_OBJECT_UNLOCK(kmem_object);
+	VM_OBJECT_WUNLOCK(kmem_object);
 
 	return (KERN_SUCCESS);
 }