From 86c9ab39dfeaebdc5394c08ea3e8c23cdfd0ebdf Mon Sep 17 00:00:00 2001 From: pgoyette Date: Fri, 18 Nov 2016 22:37:50 +0000 Subject: Clean up some #includes --- sys/fs/nfs/common/bootp_subr.c | 23 +++++++-------- sys/fs/nfs/common/krpc_subr.c | 11 ++------ sys/fs/nfs/common/nfsport.h | 63 +++++++++++++++++++----------------------- 3 files changed, 42 insertions(+), 55 deletions(-) (limited to 'sys') diff --git a/sys/fs/nfs/common/bootp_subr.c b/sys/fs/nfs/common/bootp_subr.c index 2338e1e4c66..5dd49d661b9 100644 --- a/sys/fs/nfs/common/bootp_subr.c +++ b/sys/fs/nfs/common/bootp_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootp_subr.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $ */ +/* $NetBSD: bootp_subr.c,v 1.2 2016/11/18 22:37:50 pgoyette Exp $ */ /*- * Copyright (c) 1995 Gordon Ross, Adam Glass * Copyright (c) 1992 Regents of the University of California. @@ -43,16 +43,15 @@ #include /* __FBSDID("FreeBSD: head/sys/nfs/bootp_subr.c 297326 2016-03-27 23:16:37Z ian "); */ -__RCSID("$NetBSD: bootp_subr.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $"); +__RCSID("$NetBSD: bootp_subr.c,v 1.2 2016/11/18 22:37:50 pgoyette Exp $"); -#include "opt_bootp.h" -#include "opt_nfs.h" -#include "opt_rootdevname.h" +#ifdef _KERNEL_OPT +#include "opt_newnfs.h" +#endif #include #include #include -#include #include #include #include @@ -66,7 +65,6 @@ __RCSID("$NetBSD: bootp_subr.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $"); #include #include -#include #include #ifdef BOOTP_DEBUG #include @@ -76,13 +74,12 @@ __RCSID("$NetBSD: bootp_subr.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $"); #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */ diff --git a/sys/fs/nfs/common/krpc_subr.c b/sys/fs/nfs/common/krpc_subr.c index e54ad8ce1f9..ba50286b91a 100644 --- a/sys/fs/nfs/common/krpc_subr.c +++ b/sys/fs/nfs/common/krpc_subr.c @@ -44,11 +44,10 @@ #include /* __FBSDID("FreeBSD: head/sys/nfs/krpc_subr.c 298788 2016-04-29 16:07:25Z pfg "); */ -__RCSID("$NetBSD: krpc_subr.c,v 1.5 2016/11/18 08:31:30 pgoyette Exp $"); +__RCSID("$NetBSD: krpc_subr.c,v 1.6 2016/11/18 22:37:50 pgoyette Exp $"); #include #include -#include #include #include #include @@ -57,15 +56,11 @@ __RCSID("$NetBSD: krpc_subr.c,v 1.5 2016/11/18 08:31:30 pgoyette Exp $"); #include #include -#include #include -#include -#include -#include -#include -#include +#include +#include /* * Kernel support for Sun RPC diff --git a/sys/fs/nfs/common/nfsport.h b/sys/fs/nfs/common/nfsport.h index 24218b81b8f..a3f12f05ab2 100644 --- a/sys/fs/nfs/common/nfsport.h +++ b/sys/fs/nfs/common/nfsport.h @@ -1,4 +1,4 @@ -/* $NetBSD: nfsport.h,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $ */ +/* $NetBSD: nfsport.h,v 1.2 2016/11/18 22:37:50 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * FreeBSD: head/sys/fs/nfs/nfsport.h 304026 2016-08-12 22:44:59Z rmacklem - * $NetBSD: nfsport.h,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $ + * $NetBSD: nfsport.h,v 1.2 2016/11/18 22:37:50 pgoyette Exp $ */ #ifndef _NFS_NFSPORT_H_ @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -68,24 +67,19 @@ #include #include #include -#include #include #include #include -#include #include -#include #include -#include #include -#include #include -#include + #include -#include #include #include #include + #include #include #include @@ -97,11 +91,9 @@ #include #include #include -#include + #include #include -#include -#include /* * For Darwin, these functions should be "static" when built in a kext. @@ -113,13 +105,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include "opt_nfs.h" -#include "opt_ufs.h" + +#ifdef _KERNEL_OPT +#include "opt_newnfs.h" +#include "opt_ffs.h" +#endif + +#include /* * These types must be defined before the nfs includes. @@ -495,20 +487,23 @@ struct ext_nfsstats { #define NFS_NPROCS NFSV4_NPROCS #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if 0 #include -#include +#endif /* * Just to keep nfs_var.h happy. @@ -543,7 +538,7 @@ struct nfsvattr { #define na_filerev na_vattr.va_filerev #define na_vaflags na_vattr.va_vaflags -#include +#include /* * This is the header structure used for the lists, etc. (It has the -- cgit