diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2019-08-19 22:25:28 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2019-08-19 22:25:28 +0000 |
| commit | 4153054a7c12451edd54f2f3e763d1dbfad49d09 (patch) | |
| tree | 51c8d0b1c9dcc065f71102d5647cdaba9d774b06 | |
| parent | 8a3238521b704c52bcc5fb9f9c67096c93a9e1f6 (diff) | |
Notes
| -rw-r--r-- | sys/vm/vm_object.h | 4 | ||||
| -rw-r--r-- | sys/vm/vm_pager.h | 2 | ||||
| -rw-r--r-- | sys/vm/vnode_pager.c | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 89aea522374e..9127a869e632 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -255,6 +255,10 @@ extern struct vm_object kernel_object_store; rw_wowned(&(object)->lock) #define VM_OBJECT_WUNLOCK(object) \ rw_wunlock(&(object)->lock) +#define VM_OBJECT_DROP(object) \ + lock_class_rw.lc_unlock(&(object)->lock.lock_object) +#define VM_OBJECT_PICKUP(object, state) \ + lock_class_rw.lc_lock(&(object)->lock.lock_object, (state)) struct vnode; diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index 4e23def66733..4e21de830692 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -151,7 +151,7 @@ vm_pager_has_page( ) { boolean_t ret; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); ret = (*pagertab[object->type]->pgo_haspage) (object, offset, before, after); return (ret); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index e9a78f7b33ee..70c919d9134e 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -355,13 +355,14 @@ vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, { struct vnode *vp = object->handle; daddr_t bn; + uintptr_t lockstate; int err; daddr_t reqblock; int poff; int bsize; int pagesperblock, blocksperpage; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); /* * If no vp or vp is doomed or marked transparent to VM, we do not * have the page. @@ -384,9 +385,9 @@ vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, blocksperpage = (PAGE_SIZE / bsize); reqblock = pindex * blocksperpage; } - VM_OBJECT_WUNLOCK(object); + lockstate = VM_OBJECT_DROP(object); err = VOP_BMAP(vp, reqblock, NULL, &bn, after, before); - VM_OBJECT_WLOCK(object); + VM_OBJECT_PICKUP(object, lockstate); if (err) return TRUE; if (bn == -1) |