git: cf74b2be533f - main - vfs: retire the now unused vnlru_free routine

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=cf74b2be533f0ed528a6f03af5fbd20d195dc61f

commit cf74b2be533f0ed528a6f03af5fbd20d195dc61f
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-05-22 18:42:30 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
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 *);