d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove vnode_locked label and goto, by collapsing vp calculation into

Browse Source 
the conditional.

Suggested and reviewed by:	alc
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
kib 2016-10-30 18:05:18 +00:00
parent 0c693337e5
commit 1fed6374b2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/vm/vm_fault.c
View File

@ -641,10 +641,8 @@ readrest:
*/ */
unlock_map(&fs); unlock_map(&fs);
if (fs.object->type == OBJT_VNODE) { if (fs.object->type == OBJT_VNODE &&
vp = fs.object->handle; (vp = fs.object->handle) != fs.vp) {
if (vp == fs.vp)
goto vnode_locked;
unlock_vp(&fs); unlock_vp(&fs);
locked = VOP_ISLOCKED(vp); locked = VOP_ISLOCKED(vp);
@ -667,7 +665,6 @@ readrest:
} }
fs.vp = vp; fs.vp = vp;
} }
vnode_locked:
KASSERT(fs.vp == NULL || !fs.map->system_map, KASSERT(fs.vp == NULL || !fs.map->system_map,
("vm_fault: vnode-backed object mapped by system map")); ("vm_fault: vnode-backed object mapped by system map"));