From owner-svn-src-head@freebsd.org Fri Feb 28 20:30:55 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E2922447FD; Fri, 28 Feb 2020 20:30:55 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Th4t6WZQz4M8R; Fri, 28 Feb 2020 20:30:54 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 315A975E8; Fri, 28 Feb 2020 20:30:54 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01SKUsO0044937; Fri, 28 Feb 2020 20:30:54 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01SKUs41044936; Fri, 28 Feb 2020 20:30:54 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <202002282030.01SKUs41044936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Fri, 28 Feb 2020 20:30:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358444 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 358444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2020 20:30:55 -0000 Author: jeff Date: Fri Feb 28 20:30:53 2020 New Revision: 358444 URL: https://svnweb.freebsd.org/changeset/base/358444 Log: Simplify vref() code in object_reference. The local temporary is no longer necessary. Fix formatting errors. Reported by: mjg Discussed with: kib Modified: head/sys/vm/vm_object.c Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Fri Feb 28 20:29:53 2020 (r358443) +++ head/sys/vm/vm_object.c Fri Feb 28 20:30:53 2020 (r358444) @@ -484,7 +484,6 @@ vm_object_allocate_anon(vm_pindex_t size, vm_object_t static void vm_object_reference_vnode(vm_object_t object) { - struct vnode *vp; u_int old; /* @@ -494,10 +493,8 @@ vm_object_reference_vnode(vm_object_t object) if (!refcount_acquire_if_gt(&object->ref_count, 0)) { VM_OBJECT_RLOCK(object); old = refcount_acquire(&object->ref_count); - if (object->type == OBJT_VNODE && old == 0) { - vp = object->handle; - vref(vp); - } + if (object->type == OBJT_VNODE && old == 0) + vref(object->handle); VM_OBJECT_RUNLOCK(object); } } @@ -532,13 +529,12 @@ vm_object_reference(vm_object_t object) void vm_object_reference_locked(vm_object_t object) { - struct vnode *vp; u_int old; VM_OBJECT_ASSERT_LOCKED(object); old = refcount_acquire(&object->ref_count); - if (object->type == OBJT_VNODE && old == 0) { - vp = object->handle; vref(vp); } + if (object->type == OBJT_VNODE && old == 0) + vref(object->handle); KASSERT((object->flags & OBJ_DEAD) == 0, ("vm_object_reference: Referenced dead object.")); }