[src/trunk]: src/sys/fs/nfs/common More cleanup of #includes

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac3ddcaa502d
branches:  trunk
changeset: 349538:ac3ddcaa502d
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Dec 13 22:31:51 2016 +0000

description:
More cleanup of #includes

diffstat:

 sys/fs/nfs/common/nfs_commonacl.c  |   6 +++---
 sys/fs/nfs/common/nfs_commonkrpc.c |  15 ++++++++++-----
 sys/fs/nfs/common/nfs_commonport.c |   6 +++---
 sys/fs/nfs/common/nfs_commonsubs.c |   9 ++++++---
 sys/fs/nfs/common/nfs_diskless.c   |  18 +++++++++++-------
 sys/fs/nfs/common/nfs_fha.c        |   6 +++---
 sys/fs/nfs/common/nfs_lock.c       |  16 ++++++++--------
 sys/fs/nfs/common/nfs_nfssvc.c     |  11 ++++++-----
 8 files changed, 50 insertions(+), 37 deletions(-)

diffs (277 lines):

diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_commonacl.c
--- a/sys/fs/nfs/common/nfs_commonacl.c Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_commonacl.c Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_commonacl.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $   */
+/*     $NetBSD: nfs_commonacl.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $       */
 /*-
  * Copyright (c) 2009 Rick Macklem, University of Guelph
  * All rights reserved.
@@ -28,10 +28,10 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonacl.c 297793 2016-04-10 23:07:00Z pfg "); */
-__RCSID("$NetBSD: nfs_commonacl.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonacl.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 #ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
 
 extern int nfsrv_useacl;
 #endif
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_commonkrpc.c
--- a/sys/fs/nfs/common/nfs_commonkrpc.c        Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_commonkrpc.c        Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_commonkrpc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $  */
+/*     $NetBSD: nfs_commonkrpc.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $      */
 /*-
  * Copyright (c) 1989, 1991, 1993, 1995
  *     The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,19 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonkrpc.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_commonkrpc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonkrpc.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * Socket operations for use by nfs
  */
 
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#include "opt_newnfs.h"
+#if 0
 #include "opt_kgssapi.h"
-#include "opt_nfs.h"
+#endif
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,11 +65,11 @@
 #include <sys/vnode.h>
 
 #include <rpc/rpc.h>
-#include <rpc/krpc.h>
+#include <fs/nfs/common/krpc.h>
 
 #include <kgssapi/krb5/kcrypto.h>
 
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_commonport.c
--- a/sys/fs/nfs/common/nfs_commonport.c        Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_commonport.c        Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_commonport.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $  */
+/*     $NetBSD: nfs_commonport.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $      */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,14 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonport.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_commonport.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonport.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * Functions that need to be different for different versions of BSD
  * kernel should be kept here, along with any global storage specific
  * to this BSD variant.
  */
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
 #include <sys/sysctl.h>
 #include <vm/vm.h>
 #include <vm/vm_object.h>
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_commonsubs.c
--- a/sys/fs/nfs/common/nfs_commonsubs.c        Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_commonsubs.c        Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_commonsubs.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $  */
+/*     $NetBSD: nfs_commonsubs.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $      */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonsubs.c 308708 2016-11-16 01:11:49Z cperciva "); */
-__RCSID("$NetBSD: nfs_commonsubs.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonsubs.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
@@ -42,9 +42,12 @@
  * copy data between mbuf chains and uio lists.
  */
 #ifndef APPLEKEXT
+#ifdef _KERNEL_OPT
 #include "opt_inet6.h"
+#include "opt_quota.h"
+#endif
 
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
 
 #include <security/mac/mac_framework.h>
 
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_diskless.c
--- a/sys/fs/nfs/common/nfs_diskless.c  Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_diskless.c  Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_diskless.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $    */
+/*     $NetBSD: nfs_diskless.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $        */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,9 +35,11 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_diskless.c 297086 2016-03-20 21:48:26Z ian "); */
-__RCSID("$NetBSD: nfs_diskless.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_diskless.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
-#include "opt_bootp.h"
+#ifdef _KERNEL_OPT
+#include "opt_newnfs.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,14 +52,16 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+
 #include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
-#include <nfs/nfsproto.h>
-#include <nfsclient/nfs.h>
-#include <nfs/nfsdiskless.h>
+
+#include <fs/nfs/common/nfsproto.h>
+#include <fs/nfs/client/nfs.h>
+#include <fs/nfs/common/nfsdiskless.h>
 
 #define        NFS_IFACE_TIMEOUT_SECS  10 /* Timeout for interface to appear. */
 
@@ -424,7 +428,7 @@
        }
 }
 
-#if !defined(BOOTP_NFSROOT)
+#if !defined(NEW_NFS_BOOT_BOOTP)
 static void
 nfs_rootconf(void)
 {
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_fha.c
--- a/sys/fs/nfs/common/nfs_fha.c       Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_fha.c       Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_fha.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $ */
+/*     $NetBSD: nfs_fha.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $     */
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  *
@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_fha.c 267479 2014-06-14 12:26:12Z mav "); */
-__RCSID("$NetBSD: nfs_fha.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_fha.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@
 #include <sys/sbuf.h>
 
 #include <rpc/rpc.h>
-#include <nfs/nfs_fha.h>
+#include <fs/nfs/common/nfs_fha.h>
 
 static MALLOC_DEFINE(M_NFS_FHA, "NFS FHA", "NFS FHA");
 
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_lock.c
--- a/sys/fs/nfs/common/nfs_lock.c      Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_lock.c      Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_lock.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $        */
+/*     $NetBSD: nfs_lock.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $    */
 /*-
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_lock.c 303382 2016-07-27 11:08:59Z kib "); */
-__RCSID("$NetBSD: nfs_lock.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_lock.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,12 +55,12 @@
 
 #include <net/if.h>
 
-#include <nfs/nfsproto.h>
-#include <nfs/nfs_lock.h>
-#include <nfsclient/nfs.h>
-#include <nfsclient/nfsmount.h>
-#include <nfsclient/nfsnode.h>
-#include <nfsclient/nlminfo.h>
+#include <fs/nfs/common/nfsproto.h>
+#include <fs/nfs/common/nfs_lock.h>
+#include <fs/nfs/client/nfs.h>
+#include <fs/nfs/client/nfsmount.h>
+#include <fs/nfs/client/nfsnode.h>
+#include <fs/nfs/client/nlminfo.h>
 
 extern void (*nlminfo_release_p)(struct proc *p);
 
diff -r 31756e870880 -r ac3ddcaa502d sys/fs/nfs/common/nfs_nfssvc.c
--- a/sys/fs/nfs/common/nfs_nfssvc.c    Tue Dec 13 22:17:33 2016 +0000
+++ b/sys/fs/nfs/common/nfs_nfssvc.c    Tue Dec 13 22:31:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_nfssvc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $      */
+/*     $NetBSD: nfs_nfssvc.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $  */
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -34,9 +34,11 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_nfssvc.c 298788 2016-04-29 16:07:25Z pfg "); */
-__RCSID("$NetBSD: nfs_nfssvc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfssvc.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
-#include "opt_nfs.h"
+#ifdef _KERNEL_OPT
+#include "opt_newnfs.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,11 +52,10 @@
 #include <sys/module.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
-#include <sys/sysproto.h>
 
 #include <security/audit/audit.h>
 
-#include <nfs/nfssvc.h>
+#include <fs/nfs/common/nfssvc.h>
 
 static int nfssvc_offset = SYS_nfssvc;
 static struct sysent nfssvc_prev_sysent;