From owner-svn-src-head@freebsd.org Sun Aug 16 18:51:13 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 97B913C3B86; Sun, 16 Aug 2020 18:51:13 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BV5qP3XGQz3RZm; Sun, 16 Aug 2020 18:51:13 +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 5DDD214737; Sun, 16 Aug 2020 18:51:13 +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 07GIpDPS091576; Sun, 16 Aug 2020 18:51:13 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07GIpDD2091574; Sun, 16 Aug 2020 18:51:13 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202008161851.07GIpDD2091574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 16 Aug 2020 18:51:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364283 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 364283 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.33 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: Sun, 16 Aug 2020 18:51:13 -0000 Author: mjg Date: Sun Aug 16 18:51:12 2020 New Revision: 364283 URL: https://svnweb.freebsd.org/changeset/base/364283 Log: vfs: retire vrefl as a symbol vrefl calls vref and there is only one in-tree consumer. Keep it as a macro for assertion purposes. Modified: head/sys/kern/vfs_subr.c head/sys/sys/vnode.h Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Sun Aug 16 18:45:31 2020 (r364282) +++ head/sys/kern/vfs_subr.c Sun Aug 16 18:51:12 2020 (r364283) @@ -2929,15 +2929,6 @@ vref(struct vnode *vp) } void -vrefl(struct vnode *vp) -{ - - ASSERT_VI_LOCKED(vp, __func__); - CTR2(KTR_VFS, "%s: vp %p", __func__, vp); - vref(vp); -} - -void vrefact(struct vnode *vp) { Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Sun Aug 16 18:45:31 2020 (r364282) +++ head/sys/sys/vnode.h Sun Aug 16 18:51:12 2020 (r364283) @@ -965,7 +965,6 @@ do { \ void vput(struct vnode *vp); void vrele(struct vnode *vp); void vref(struct vnode *vp); -void vrefl(struct vnode *vp); void vrefact(struct vnode *vp); void v_addpollinfo(struct vnode *vp); static __inline int @@ -974,6 +973,11 @@ vrefcnt(struct vnode *vp) return (vp->v_usecount); } + +#define vrefl(vp) do { \ + ASSERT_VI_LOCKED(vp, __func__); \ + vref(vp); \ +} while (0) int vnode_create_vobject(struct vnode *vp, off_t size, struct thread *td); void vnode_destroy_vobject(struct vnode *vp);