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

Simplify vref() code in object_reference. The local temporary is no longer

Browse Source 
necessary.  Fix formatting errors.

Reported by:	mjg
Discussed with:	kib
This commit is contained in:
jeff 2020-02-28 20:30:53 +00:00
parent 86dc6f3bc4
commit 45d716be60
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/vm/vm_object.c
View File

@ -484,7 +484,6 @@ vm_object_allocate_anon(vm_pindex_t size, vm_object_t backing_object,
static void static void
vm_object_reference_vnode(vm_object_t object) vm_object_reference_vnode(vm_object_t object)
{ {
struct vnode *vp;
u_int old; u_int old;
/* /*
@ -494,10 +493,8 @@ vm_object_reference_vnode(vm_object_t object)
if (!refcount_acquire_if_gt(&object->ref_count, 0)) { if (!refcount_acquire_if_gt(&object->ref_count, 0)) {
VM_OBJECT_RLOCK(object); VM_OBJECT_RLOCK(object);
old = refcount_acquire(&object->ref_count); old = refcount_acquire(&object->ref_count);
if (object->type == OBJT_VNODE && old == 0) { if (object->type == OBJT_VNODE && old == 0)
vp = object->handle; vref(object->handle);
vref(vp);
}
VM_OBJECT_RUNLOCK(object); VM_OBJECT_RUNLOCK(object);
} }
} }
@ -532,13 +529,12 @@ vm_object_reference(vm_object_t object)
void void
vm_object_reference_locked(vm_object_t object) vm_object_reference_locked(vm_object_t object)
{ {
struct vnode *vp;
u_int old; u_int old;
VM_OBJECT_ASSERT_LOCKED(object); VM_OBJECT_ASSERT_LOCKED(object);
old = refcount_acquire(&object->ref_count); old = refcount_acquire(&object->ref_count);
if (object->type == OBJT_VNODE && old == 0) { if (object->type == OBJT_VNODE && old == 0)
vp = object->handle; vref(vp); } vref(object->handle);
KASSERT((object->flags & OBJ_DEAD) == 0, KASSERT((object->flags & OBJ_DEAD) == 0,
("vm_object_reference: Referenced dead object.")); ("vm_object_reference: Referenced dead object."));
} }