From owner-svn-src-all@freebsd.org Sat Feb 8 15:52:21 2020 Return-Path: Delivered-To: svn-src-all@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 9ADBC244E06; Sat, 8 Feb 2020 15:52:21 +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 48FGrj3jPYz3xj0; Sat, 8 Feb 2020 15:52:21 +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 7AA241FBE9; Sat, 8 Feb 2020 15:52:21 +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 018FqLhB055866; Sat, 8 Feb 2020 15:52:21 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 018FqLm5055864; Sat, 8 Feb 2020 15:52:21 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202002081552.018FqLm5055864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 8 Feb 2020 15:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357680 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 357680 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Feb 2020 15:52:21 -0000 Author: mjg Date: Sat Feb 8 15:52:20 2020 New Revision: 357680 URL: https://svnweb.freebsd.org/changeset/base/357680 Log: vfs: tidy up vget_finish and vn_lock - remove assertion which duplicates vn_lock - use VNPASS instead of retyping the failure - report what flags were passed if panicking on them Modified: head/sys/kern/vfs_subr.c head/sys/kern/vfs_vnops.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Sat Feb 8 15:51:08 2020 (r357679) +++ head/sys/kern/vfs_subr.c Sat Feb 8 15:52:20 2020 (r357680) @@ -2889,19 +2889,12 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat { int error, old; - VNASSERT((flags & LK_TYPE_MASK) != 0, vp, - ("%s: invalid lock operation", __func__)); - if ((flags & LK_INTERLOCK) != 0) ASSERT_VI_LOCKED(vp, __func__); else ASSERT_VI_UNLOCKED(vp, __func__); - VNASSERT(vp->v_holdcnt > 0, vp, ("%s: vnode not held", __func__)); - if (vs == VGET_USECOUNT) { - VNASSERT(vp->v_usecount > 0, vp, - ("%s: vnode without usecount when VGET_USECOUNT was passed", - __func__)); - } + VNPASS(vp->v_holdcnt > 0, vp); + VNPASS(vs == VGET_HOLDCNT || vp->v_usecount > 0, vp); error = vn_lock(vp, flags); if (__predict_false(error != 0)) { @@ -2914,9 +2907,8 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat return (error); } - if (vs == VGET_USECOUNT) { + if (vs == VGET_USECOUNT) return (0); - } if (__predict_false(vp->v_type == VCHR)) return (vget_finish_vchr(vp)); Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Sat Feb 8 15:51:08 2020 (r357679) +++ head/sys/kern/vfs_vnops.c Sat Feb 8 15:52:20 2020 (r357680) @@ -1606,8 +1606,9 @@ _vn_lock(struct vnode *vp, int flags, char *file, int { int error; - VNASSERT((flags & LK_TYPE_MASK) != 0, vp, ("vn_lock: no locktype")); - VNASSERT(vp->v_holdcnt != 0, vp, ("vn_lock: zero hold count")); + VNASSERT((flags & LK_TYPE_MASK) != 0, vp, + ("vn_lock: no locktype (%d passed)", flags)); + VNPASS(vp->v_holdcnt > 0, vp); error = VOP_LOCK1(vp, flags, file, line); if (__predict_false(error != 0 || VN_IS_DOOMED(vp))) return (_vn_lock_fallback(vp, flags, file, line, error));