From owner-svn-src-head@freebsd.org Mon Feb 3 14:25:34 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 0C2E424DF3E; Mon, 3 Feb 2020 14:25:34 +0000 (UTC) (envelope-from mjg@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 48B98s6QlRz4cqy; Mon, 3 Feb 2020 14:25:33 +0000 (UTC) (envelope-from mjg@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 D7B0A1EFA; Mon, 3 Feb 2020 14:25:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 013EPXPr080709; Mon, 3 Feb 2020 14:25:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 013EPWtO080704; Mon, 3 Feb 2020 14:25:32 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202002031425.013EPWtO080704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 3 Feb 2020 14:25:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357446 - in head/sys: fs/devfs fs/nullfs kern ufs/ffs vm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: fs/devfs fs/nullfs kern ufs/ffs vm X-SVN-Commit-Revision: 357446 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: Mon, 03 Feb 2020 14:25:34 -0000 Author: mjg Date: Mon Feb 3 14:25:32 2020 New Revision: 357446 URL: https://svnweb.freebsd.org/changeset/base/357446 Log: Fix up various vnode-related asserts which did not dump the used vnode Modified: head/sys/fs/devfs/devfs_vnops.c head/sys/fs/nullfs/null_subr.c head/sys/kern/vfs_bio.c head/sys/ufs/ffs/ffs_vnops.c head/sys/vm/vnode_pager.c Modified: head/sys/fs/devfs/devfs_vnops.c ============================================================================== --- head/sys/fs/devfs/devfs_vnops.c Mon Feb 3 13:50:55 2020 (r357445) +++ head/sys/fs/devfs/devfs_vnops.c Mon Feb 3 14:25:32 2020 (r357446) @@ -479,8 +479,7 @@ loop: dev_refl(dev); /* XXX: v_rdev should be protect by vnode lock */ vp->v_rdev = dev; - KASSERT(vp->v_usecount == 1, - ("%s %d (%d)\n", __func__, __LINE__, vp->v_usecount)); + VNPASS(vp->v_usecount == 1, vp); dev->si_usecount++; /* Special casing of ttys for deadfs. Probably redundant. */ dsw = dev->si_devsw; Modified: head/sys/fs/nullfs/null_subr.c ============================================================================== --- head/sys/fs/nullfs/null_subr.c Mon Feb 3 13:50:55 2020 (r357445) +++ head/sys/fs/nullfs/null_subr.c Mon Feb 3 14:25:32 2020 (r357446) @@ -209,7 +209,7 @@ null_nodeget(mp, lowervp, vpp) int error; ASSERT_VOP_LOCKED(lowervp, "lowervp"); - KASSERT(lowervp->v_usecount >= 1, ("Unreferenced vnode %p", lowervp)); + VNPASS(lowervp->v_usecount > 0, lowervp); /* Lookup the hash firstly. */ *vpp = null_hashget(mp, lowervp); Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Mon Feb 3 13:50:55 2020 (r357445) +++ head/sys/kern/vfs_bio.c Mon Feb 3 14:25:32 2020 (r357446) @@ -2859,10 +2859,8 @@ vfs_vmio_iodone(struct buf *bp) REFCOUNT_COUNT(obj->paging_in_progress), bp->b_npages)); vp = bp->b_vp; - KASSERT(vp->v_holdcnt > 0, - ("vfs_vmio_iodone: vnode %p has zero hold count", vp)); - KASSERT(vp->v_object != NULL, - ("vfs_vmio_iodone: vnode %p has no vm_object", vp)); + VNPASS(vp->v_holdcnt > 0, vp); + VNPASS(vp->v_object != NULL, vp); foff = bp->b_offset; KASSERT(bp->b_offset != NOOFFSET, Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Mon Feb 3 13:50:55 2020 (r357445) +++ head/sys/ufs/ffs/ffs_vnops.c Mon Feb 3 14:25:32 2020 (r357446) @@ -441,8 +441,7 @@ ffs_lock(ap) flags = ap->a_flags; for (;;) { #ifdef DEBUG_VFS_LOCKS - KASSERT(vp->v_holdcnt != 0, - ("ffs_lock %p: zero hold count", vp)); + VNPASS(vp->v_holdcnt != 0, vp); #endif lkp = vp->v_vnlock; result = _lockmgr_args(lkp, flags, VI_MTX(vp), Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Mon Feb 3 13:50:55 2020 (r357445) +++ head/sys/vm/vnode_pager.c Mon Feb 3 14:25:32 2020 (r357446) @@ -248,7 +248,7 @@ vnode_pager_alloc(void *handle, vm_ooffset_t size, vm_ vp = (struct vnode *)handle; ASSERT_VOP_LOCKED(vp, "vnode_pager_alloc"); - KASSERT(vp->v_usecount != 0, ("vnode_pager_alloc: no vnode reference")); + VNPASS(vp->v_usecount > 0, vp); retry: object = vp->v_object;