From owner-dev-commits-src-main@freebsd.org Sat May 22 18:44:00 2021 Return-Path: Delivered-To: dev-commits-src-main@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 4F28C6351B4; Sat, 22 May 2021 18:44:00 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FnXSJ053zz4gdk; Sat, 22 May 2021 18:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D73F310F7; Sat, 22 May 2021 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14MIhxpA033017; Sat, 22 May 2021 18:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14MIhx5A033016; Sat, 22 May 2021 18:43:59 GMT (envelope-from git) Date: Sat, 22 May 2021 18:43:59 GMT Message-Id: <202105221843.14MIhx5A033016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: cf74b2be533f - main - vfs: retire the now unused vnlru_free routine MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf74b2be533f0ed528a6f03af5fbd20d195dc61f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 18:44:00 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cf74b2be533f0ed528a6f03af5fbd20d195dc61f commit cf74b2be533f0ed528a6f03af5fbd20d195dc61f Author: Mateusz Guzik AuthorDate: 2021-05-22 18:42:30 +0000 Commit: Mateusz Guzik CommitDate: 2021-05-22 18:42:30 +0000 vfs: retire the now unused vnlru_free routine --- sys/kern/vfs_subr.c | 27 --------------------------- sys/sys/vnode.h | 1 - 2 files changed, 28 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 979cccf0e0dc..6a3cf2aa7505 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1349,33 +1349,6 @@ vnlru_free_vfsops(int count, struct vfsops *mnt_op, struct vnode *mvp) mtx_unlock(&vnode_list_mtx); } -/* - * Temporary binary compat, don't use. Call vnlru_free_vfsops instead. - */ -void -vnlru_free(int count, struct vfsops *mnt_op) -{ - struct vnode *mvp; - - if (count == 0) - return; - mtx_lock(&vnode_list_mtx); - mvp = vnode_list_free_marker; - if (vnlru_free_impl(count, mnt_op, mvp) == 0) { - /* - * It is possible the marker was moved over eligible vnodes by - * callers which filtered by different ops. If so, start from - * scratch. - */ - if (vnlru_read_freevnodes() > 0) { - TAILQ_REMOVE(&vnode_list, mvp, v_vnodelist); - TAILQ_INSERT_HEAD(&vnode_list, mvp, v_vnodelist); - } - vnlru_free_impl(count, mnt_op, mvp); - } - mtx_unlock(&vnode_list_mtx); -} - struct vnode * vnlru_alloc_marker(void) { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index f45824e3dc89..a61ef2611b0a 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -828,7 +828,6 @@ int vfs_write_suspend(struct mount *mp, int flags); int vfs_write_suspend_umnt(struct mount *mp); struct vnode *vnlru_alloc_marker(void); void vnlru_free_marker(struct vnode *); -void vnlru_free(int, struct vfsops *); void vnlru_free_vfsops(int, struct vfsops *, struct vnode *); int vop_stdbmap(struct vop_bmap_args *); int vop_stdfdatasync_buf(struct vop_fdatasync_args *);