From owner-svn-src-head@freebsd.org Fri Nov 30 04:18:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 328DF11575E6; Fri, 30 Nov 2018 04:18:32 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C904E6BA7F; Fri, 30 Nov 2018 04:18:31 +0000 (UTC) (envelope-from vangyzen@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 A5C41235FC; Fri, 30 Nov 2018 04:18:31 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAU4IVPx095670; Fri, 30 Nov 2018 04:18:31 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAU4IV61095669; Fri, 30 Nov 2018 04:18:31 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201811300418.wAU4IV61095669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Fri, 30 Nov 2018 04:18:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341281 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 341281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C904E6BA7F X-Spamd-Result: default: False [0.86 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.31)[0.307,0]; NEURAL_SPAM_SHORT(0.29)[0.294,0]; NEURAL_SPAM_MEDIUM(0.26)[0.256,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org 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, 30 Nov 2018 04:18:32 -0000 Author: vangyzen Date: Fri Nov 30 04:18:31 2018 New Revision: 341281 URL: https://svnweb.freebsd.org/changeset/base/341281 Log: Add assertions and comment to vm_object_vnode() Reviewed by: kib MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D2724 Modified: head/sys/vm/vm_object.c Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Fri Nov 30 04:15:56 2018 (r341280) +++ head/sys/vm/vm_object.c Fri Nov 30 04:18:31 2018 (r341281) @@ -2306,16 +2306,28 @@ next_page: } } +/* + * Return the vnode for the given object, or NULL if none exists. + * For tmpfs objects, the function may return NULL if there is + * no vnode allocated at the time of the call. + */ struct vnode * vm_object_vnode(vm_object_t object) { + struct vnode *vp; VM_OBJECT_ASSERT_LOCKED(object); - if (object->type == OBJT_VNODE) - return (object->handle); - if (object->type == OBJT_SWAP && (object->flags & OBJ_TMPFS) != 0) - return (object->un_pager.swp.swp_tmpfs); - return (NULL); + if (object->type == OBJT_VNODE) { + vp = object->handle; + KASSERT(vp != NULL, ("%s: OBJT_VNODE has no vnode", __func__)); + } else if (object->type == OBJT_SWAP && + (object->flags & OBJ_TMPFS) != 0) { + vp = object->un_pager.swp.swp_tmpfs; + KASSERT(vp != NULL, ("%s: OBJT_TMPFS has no vnode", __func__)); + } else { + vp = NULL; + } + return (vp); } static int