diff options
| author | kib <kib@FreeBSD.org> | 2016-11-06 13:35:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-11-06 13:35:20 +0000 |
| commit | 24ae4ae0920f2016d9e55bdce23f3bfe10f5fd55 (patch) | |
| tree | 417fb75b9817e67e2384886fac0fa8385685012a | |
| parent | bdbbbb4c64014160ff10f8e2e5f52014385c22fa (diff) | |
| download | FreeBSD-src-24ae4ae0920f2016d9e55bdce23f3bfe10f5fd55.zip FreeBSD-src-24ae4ae0920f2016d9e55bdce23f3bfe10f5fd55.tar.gz | |
MFC r308109:
Remove vnode_locked label and goto.
| -rw-r--r-- | sys/vm/vm_fault.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 904839a..8f4fc70 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -627,10 +627,8 @@ readrest: */ unlock_map(&fs); - if (fs.object->type == OBJT_VNODE) { - vp = fs.object->handle; - if (vp == fs.vp) - goto vnode_locked; + if (fs.object->type == OBJT_VNODE && + (vp = fs.object->handle) != fs.vp) { unlock_vp(&fs); locked = VOP_ISLOCKED(vp); @@ -653,7 +651,6 @@ readrest: } fs.vp = vp; } -vnode_locked: KASSERT(fs.vp == NULL || !fs.map->system_map, ("vm_fault: vnode-backed object mapped by system map")); |
