From 564dba153ad58a54537fe1a69624950a6a705de2 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Wed, 1 May 2024 13:15:59 +0000
Subject: [PATCH] remove unneeded includes ok miod@ mpi@

---
 sys/nfs/krpc_subr.c    |  6 +-----
 sys/nfs/nfs_bio.c      |  5 +----
 sys/nfs/nfs_boot.c     |  4 +---
 sys/nfs/nfs_debug.c    |  7 +------
 sys/nfs/nfs_kq.c       |  5 +----
 sys/nfs/nfs_node.c     |  5 +----
 sys/nfs/nfs_serv.c     |  4 +---
 sys/nfs/nfs_srvcache.c |  3 +--
 sys/nfs/nfs_subs.c     |  4 +---
 sys/nfs/nfs_syscalls.c | 11 +----------
 sys/nfs/nfs_vfsops.c   |  7 +------
 sys/nfs/nfs_vnops.c    | 10 +---------
 12 files changed, 12 insertions(+), 59 deletions(-)

diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index fec8ae712e8..87b3cdecd1a 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: krpc_subr.c,v 1.38 2023/08/03 09:49:09 mvs Exp $	*/
+/*	$OpenBSD: krpc_subr.c,v 1.39 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
 
 /*
@@ -45,12 +45,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
-#include <sys/mount.h>
 #include <sys/mbuf.h>
-#include <sys/reboot.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 0048f7d17df..78533f7042c 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_bio.c,v 1.85 2024/04/30 16:54:47 miod Exp $	*/
+/*	$OpenBSD: nfs_bio.c,v 1.86 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $	*/
 
 /*
@@ -37,14 +37,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/kernel.h>
-#include <sys/namei.h>
 #include <sys/queue.h>
 #include <sys/time.h>
 
diff --git a/sys/nfs/nfs_boot.c b/sys/nfs/nfs_boot.c
index 6cb57e61c95..02f0b8d8b94 100644
--- a/sys/nfs/nfs_boot.c
+++ b/sys/nfs/nfs_boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_boot.c,v 1.48 2022/03/05 09:50:49 jsg Exp $ */
+/*	$OpenBSD: nfs_boot.c,v 1.49 2024/05/01 13:15:59 jsg Exp $ */
 /*	$NetBSD: nfs_boot.c,v 1.26 1996/05/07 02:51:25 thorpej Exp $	*/
 
 /*
@@ -31,11 +31,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/mbuf.h>
-#include <sys/reboot.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/queue.h>
diff --git a/sys/nfs/nfs_debug.c b/sys/nfs/nfs_debug.c
index 74d36722cd1..0e73ebf7d7a 100644
--- a/sys/nfs/nfs_debug.c
+++ b/sys/nfs/nfs_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_debug.c,v 1.6 2014/09/14 14:17:26 jsg Exp $ */
+/*	$OpenBSD: nfs_debug.c,v 1.7 2024/05/01 13:15:59 jsg Exp $ */
 /*
  * Copyright (c) 2009 Thordur I. Bjornsson. <thib@openbsd.org>
  *
@@ -16,18 +16,13 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/timeout.h>
 #include <sys/mount.h>
-#include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/vnode.h>
 
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
-#include <nfs/nfsmount.h>
-#include <nfs/nfs_var.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_interface.h>
diff --git a/sys/nfs/nfs_kq.c b/sys/nfs/nfs_kq.c
index 9ac86b51c57..66bb2f1e5b7 100644
--- a/sys/nfs/nfs_kq.c
+++ b/sys/nfs/nfs_kq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_kq.c,v 1.36 2023/09/08 20:00:28 mvs Exp $ */
+/*	$OpenBSD: nfs_kq.c,v 1.37 2024/05/01 13:15:59 jsg Exp $ */
 /*	$NetBSD: nfs_kq.c,v 1.7 2003/10/30 01:43:10 simonb Exp $	*/
 
 /*-
@@ -32,18 +32,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
-#include <sys/unistd.h>
 #include <sys/file.h>
 #include <sys/kthread.h>
 #include <sys/rwlock.h>
 #include <sys/queue.h>
 
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index c8ac3b9bb14..26a910eb6c2 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_node.c,v 1.75 2022/06/27 13:39:58 visa Exp $	*/
+/*	$OpenBSD: nfs_node.c,v 1.76 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $	*/
 
 /*
@@ -43,13 +43,10 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/rwlock.h>
-#include <sys/queue.h>
 
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 3f6c9463e23..b03d4a5f47a 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_serv.c,v 1.125 2024/04/30 17:05:20 miod Exp $	*/
+/*	$OpenBSD: nfs_serv.c,v 1.126 2024/05/01 13:15:59 jsg Exp $	*/
 /*     $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $       */
 
 /*
@@ -66,9 +66,7 @@
 #include <sys/mbuf.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
-#include <sys/kernel.h>
 #include <sys/pool.h>
-#include <sys/queue.h>
 #include <sys/unistd.h>
 
 #include <ufs/ufs/dir.h>
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 83797fd2b62..297d2d59323 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_srvcache.c,v 1.30 2024/04/30 17:05:20 miod Exp $	*/
+/*	$OpenBSD: nfs_srvcache.c,v 1.31 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_srvcache.c,v 1.12 1996/02/18 11:53:49 fvdl Exp $	*/
 
 /*
@@ -42,7 +42,6 @@
  */
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index a3d81091b6a..63f85c24253 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_subs.c,v 1.148 2024/04/30 17:05:20 miod Exp $	*/
+/*	$OpenBSD: nfs_subs.c,v 1.149 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $	*/
 
 /*
@@ -63,8 +63,6 @@
 #include <nfs/nfs_var.h>
 #include <nfs/nfsm_subs.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <netinet/in.h>
 
 #include <crypto/idgen.h>
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 0c83e6172fa..4e6b0f0edf1 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_syscalls.c,v 1.125 2024/04/30 17:05:20 miod Exp $	*/
+/*	$OpenBSD: nfs_syscalls.c,v 1.126 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $	*/
 
 /*
@@ -37,14 +37,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/pool.h>
-#include <sys/proc.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
@@ -52,8 +48,6 @@
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
-#include <sys/namei.h>
-#include <sys/syslog.h>
 #include <sys/filedesc.h>
 #include <sys/signalvar.h>
 #include <sys/kthread.h>
@@ -63,12 +57,9 @@
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <nfs/xdr_subs.h>
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsrvcache.h>
-#include <nfs/nfsmount.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfs_var.h>
 
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 0c01f71eeeb..e951b58ae45 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vfsops.c,v 1.129 2024/04/30 17:04:23 miod Exp $	*/
+/*	$OpenBSD: nfs_vfsops.c,v 1.130 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $	*/
 
 /*
@@ -37,16 +37,12 @@
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
-#include <sys/signal.h>
 #include <sys/proc.h>
-#include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/swap.h>
-#include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/dirent.h>
 #include <sys/socket.h>
@@ -57,7 +53,6 @@
 
 #include <netinet/in.h>
 
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 4d6e2d96b6c..7bb05c1f633 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.197 2024/04/30 17:05:20 miod Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.198 2024/05/01 13:15:59 jsg Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -41,16 +41,13 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/resourcevar.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/mbuf.h>
-#include <sys/conf.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
@@ -63,7 +60,6 @@
 
 #include <miscfs/fifofs/fifo.h>
 
-#include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
@@ -72,10 +68,6 @@
 #include <nfs/nfs_var.h>
 #include <nfs/nfsm_subs.h>
 
-#include <uvm/uvm_extern.h>
-
-#include <netinet/in.h>
-
 int nfs_access(void *);
 int nfs_advlock(void *);
 int nfs_bmap(void *);
-- 
2.20.1