diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-21 21:54:53 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-21 21:54:53 +0000 |
| commit | 905e648d428b4f43651b120c5e7f4a9f46074308 (patch) | |
| tree | 5ec5c4181bdee409366e113e2fb2016d8daa172b /sys/vm/device_pager.c | |
| parent | 81a3802a87e56d02e5acb78c627a9c3125941921 (diff) | |
| download | FreeBSD-src-905e648d428b4f43651b120c5e7f4a9f46074308.zip FreeBSD-src-905e648d428b4f43651b120c5e7f4a9f46074308.tar.gz | |
Hide the details for the assertion for VM_OBJECT_LOCK operations.
Rename current VM_OBJECT_LOCK_ASSERT(foo, RA_WLOCKED) into
VM_OBJECT_ASSERT_WLOCKED(foo)
Sponsored by: EMC / Isilon storage division
Requested by: alc
Diffstat (limited to 'sys/vm/device_pager.c')
| -rw-r--r-- | sys/vm/device_pager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index fd38add..fd20664 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -207,7 +207,7 @@ void cdev_pager_free_page(vm_object_t object, vm_page_t m) { - VM_OBJECT_LOCK_ASSERT(object, RA_WLOCKED); + VM_OBJECT_ASSERT_WLOCKED(object); if (object->type == OBJT_MGTDEVICE) { KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("unmanaged %p", m)); pmap_remove_all(m); @@ -222,7 +222,7 @@ static void dev_pager_free_page(vm_object_t object, vm_page_t m) { - VM_OBJECT_LOCK_ASSERT(object, RA_WLOCKED); + VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->type == OBJT_DEVICE && (m->oflags & VPO_UNMANAGED) != 0), ("Managed device or page obj %p m %p", object, m)); @@ -259,11 +259,11 @@ dev_pager_getpages(vm_object_t object, vm_page_t *ma, int count, int reqpage) { int error, i; - VM_OBJECT_LOCK_ASSERT(object, RA_WLOCKED); + VM_OBJECT_ASSERT_WLOCKED(object); error = object->un_pager.devp.ops->cdev_pg_fault(object, IDX_TO_OFF(ma[reqpage]->pindex), PROT_READ, &ma[reqpage]); - VM_OBJECT_LOCK_ASSERT(object, RA_WLOCKED); + VM_OBJECT_ASSERT_WLOCKED(object); for (i = 0; i < count; i++) { if (i != reqpage) { |
