Mailing List Archive

From:: Jonathan Gray <jsg@jsg.id.au>
Subject:: fewer #includes in nfs
To:: tech@openbsd.org
Date:: Wed, 1 May 2024 16:22:52 +1000
Download raw body.
Thread
2024-05-01 06:22 Jonathan Gray:
fewer #includes in nfs
in part from devel/include-what-you-use

prototypes for uvm functions used are in vnode.h
so no need to include uvm_extern.h

diff --git sys/nfs/krpc_subr.c sys/nfs/krpc_subr.c
index fec8ae712e8..77d8f9dbb9e 100644
--- sys/nfs/krpc_subr.c
+++ sys/nfs/krpc_subr.c
@@ -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 sys/nfs/nfs_bio.c sys/nfs/nfs_bio.c
index 0048f7d17df..5e17d3510e4 100644
--- sys/nfs/nfs_bio.c
+++ sys/nfs/nfs_bio.c
@@ -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 sys/nfs/nfs_boot.c sys/nfs/nfs_boot.c
index 6cb57e61c95..24d908c3eba 100644
--- sys/nfs/nfs_boot.c
+++ sys/nfs/nfs_boot.c
@@ -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 sys/nfs/nfs_debug.c sys/nfs/nfs_debug.c
index 74d36722cd1..a9612f9833c 100644
--- sys/nfs/nfs_debug.c
+++ sys/nfs/nfs_debug.c
@@ -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 sys/nfs/nfs_kq.c sys/nfs/nfs_kq.c
index 9ac86b51c57..edb439e3d41 100644
--- sys/nfs/nfs_kq.c
+++ sys/nfs/nfs_kq.c
@@ -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 sys/nfs/nfs_node.c sys/nfs/nfs_node.c
index c8ac3b9bb14..01d88d78190 100644
--- sys/nfs/nfs_node.c
+++ sys/nfs/nfs_node.c
@@ -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 sys/nfs/nfs_serv.c sys/nfs/nfs_serv.c
index 3f6c9463e23..7af307a1c82 100644
--- sys/nfs/nfs_serv.c
+++ sys/nfs/nfs_serv.c
@@ -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 sys/nfs/nfs_srvcache.c sys/nfs/nfs_srvcache.c
index 83797fd2b62..9dd25f6d588 100644
--- sys/nfs/nfs_srvcache.c
+++ sys/nfs/nfs_srvcache.c
@@ -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 sys/nfs/nfs_subs.c sys/nfs/nfs_subs.c
index a3d81091b6a..47a05ee4d35 100644
--- sys/nfs/nfs_subs.c
+++ sys/nfs/nfs_subs.c
@@ -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 sys/nfs/nfs_syscalls.c sys/nfs/nfs_syscalls.c
index 0c83e6172fa..ce820e1d501 100644
--- sys/nfs/nfs_syscalls.c
+++ sys/nfs/nfs_syscalls.c
@@ -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 sys/nfs/nfs_vfsops.c sys/nfs/nfs_vfsops.c
index 0c01f71eeeb..cf4f4fbeba9 100644
--- sys/nfs/nfs_vfsops.c
+++ sys/nfs/nfs_vfsops.c
@@ -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 sys/nfs/nfs_vnops.c sys/nfs/nfs_vnops.c
index 4d6e2d96b6c..e54e344e194 100644
--- sys/nfs/nfs_vnops.c
+++ sys/nfs/nfs_vnops.c
@@ -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 *);
2024-05-01 06:22 Jonathan Gray:
fewer #includes in nfs