diff options
| author | kib <kib@FreeBSD.org> | 2016-11-06 12:49:15 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-11-06 12:49:15 +0000 |
| commit | 2a5b6ceff94b31e68ea6e9b4f1a672e643a5e367 (patch) | |
| tree | 97416e01d85fb458f2c998f78997ebf28ccc5348 /sys/vm | |
| parent | d3348aee06dd881eb20457b307557adb649a72d1 (diff) | |
| download | FreeBSD-src-2a5b6ceff94b31e68ea6e9b4f1a672e643a5e367.zip FreeBSD-src-2a5b6ceff94b31e68ea6e9b4f1a672e643a5e367.tar.gz | |
MFC r308109:
Remove vnode_locked label and goto.
Diffstat (limited to 'sys/vm')
| -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 8e920a0..5571963 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -640,10 +640,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); @@ -666,7 +664,6 @@ readrest: } fs.vp = vp; } -vnode_locked: KASSERT(fs.vp == NULL || !fs.map->system_map, ("vm_fault: vnode-backed object mapped by system map")); |
