Module Name: src
Committed By: pgoyette
Date: Tue Dec 13 22:31:51 UTC 2016
Modified Files:
src/sys/fs/nfs/common: nfs_commonacl.c nfs_commonkrpc.c
nfs_commonport.c nfs_commonsubs.c
Log Message:
More cleanup of #includes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs_commonacl.c \
src/sys/fs/nfs/common/nfs_commonkrpc.c \
src/sys/fs/nfs/common/nfs_commonport.c \
src/sys/fs/nfs/common/nfs_commonsubs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/nfs/common/nfs_commonacl.c
diff -u src/sys/fs/nfs/common/nfs_commonacl.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonacl.c:1.2
--- src/sys/fs/nfs/common/nfs_commonacl.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonacl.c Tue Dec 13 22:31:51 2016
@@ -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
Index: src/sys/fs/nfs/common/nfs_commonkrpc.c
diff -u src/sys/fs/nfs/common/nfs_commonkrpc.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonkrpc.c:1.2
--- src/sys/fs/nfs/common/nfs_commonkrpc.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonkrpc.c Tue Dec 13 22:31:51 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_commonkrpc.c,v 1.1
#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>
Index: src/sys/fs/nfs/common/nfs_commonport.c
diff -u src/sys/fs/nfs/common/nfs_commonport.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonport.c:1.2
--- src/sys/fs/nfs/common/nfs_commonport.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonport.c Tue Dec 13 22:31:51 2016
@@ -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>
Index: src/sys/fs/nfs/common/nfs_commonsubs.c
diff -u src/sys/fs/nfs/common/nfs_commonsubs.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonsubs.c:1.2
--- src/sys/fs/nfs/common/nfs_commonsubs.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonsubs.c Tue Dec 13 22:31:51 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_commonsubs.c,v 1.1
* 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>
