summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_cluster.c
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2013-02-21 21:54:53 +0000
committerattilio <attilio@FreeBSD.org>2013-02-21 21:54:53 +0000
commit905e648d428b4f43651b120c5e7f4a9f46074308 (patch)
tree5ec5c4181bdee409366e113e2fb2016d8daa172b /sys/kern/vfs_cluster.c
parent81a3802a87e56d02e5acb78c627a9c3125941921 (diff)
downloadFreeBSD-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/kern/vfs_cluster.c')
-rw-r--r--sys/kern/vfs_cluster.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 1660cb4..70937a2 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -413,8 +413,7 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp)
tinc = tsize;
if (toff + tinc > PAGE_SIZE)
tinc = PAGE_SIZE - toff;
- VM_OBJECT_LOCK_ASSERT(tbp->b_pages[j]->object,
- RA_WLOCKED);
+ VM_OBJECT_ASSERT_WLOCKED(tbp->b_pages[j]->object);
if ((tbp->b_pages[j]->valid &
vm_page_bits(toff, tinc)) != 0)
break;
@@ -490,7 +489,7 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp)
*/
VM_OBJECT_WLOCK(bp->b_bufobj->bo_object);
for (j = 0; j < bp->b_npages; j++) {
- VM_OBJECT_LOCK_ASSERT(bp->b_pages[j]->object, RA_WLOCKED);
+ VM_OBJECT_ASSERT_WLOCKED(bp->b_pages[j]->object);
if (bp->b_pages[j]->valid == VM_PAGE_BITS_ALL)
bp->b_pages[j] = bogus_page;
}
OpenPOWER on IntegriCloud