Module Name: src
Committed By: pgoyette
Date: Tue Dec 13 21:50:32 UTC 2016
Modified Files:
src/sys/fs/nfs/server: nfs_fha_new.c nfs_nfsdcache.c nfs_nfsdkrpc.c
nfs_nfsdport.c nfs_nfsdserv.c nfs_nfsdsocket.c nfs_nfsdstate.c
nfs_nfsdsubs.c
Log Message:
Update locations for new nfs header files.
XXX Some #includes are just disabled (via #if 0) and will need to be
XXX resolved before further progress can be made.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/server/nfs_fha_new.c \
src/sys/fs/nfs/server/nfs_nfsdport.c \
src/sys/fs/nfs/server/nfs_nfsdsocket.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/server/nfs_nfsdcache.c \
src/sys/fs/nfs/server/nfs_nfsdkrpc.c src/sys/fs/nfs/server/nfs_nfsdserv.c \
src/sys/fs/nfs/server/nfs_nfsdstate.c \
src/sys/fs/nfs/server/nfs_nfsdsubs.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/server/nfs_fha_new.c
diff -u src/sys/fs/nfs/server/nfs_fha_new.c:1.1.1.2 src/sys/fs/nfs/server/nfs_fha_new.c:1.2
--- src/sys/fs/nfs/server/nfs_fha_new.c:1.1.1.2 Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/server/nfs_fha_new.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_fha_new.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $ */
+/* $NetBSD: nfs_fha_new.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
@@ -27,17 +27,17 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_fha_new.c 259765 2013-12-23 08:43:16Z mav "); */
-__RCSID("$NetBSD: nfs_fha_new.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_fha_new.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
#include <rpc/rpc.h>
-#include <nfs/nfs_fha.h>
-#include <fs/nfs/xdr_subs.h>
-#include <fs/nfs/nfs.h>
-#include <fs/nfs/nfsproto.h>
-#include <fs/nfs/nfsm_subs.h>
-#include <fs/nfsserver/nfs_fha_new.h>
+#include <fs/nfs/common/nfs_fha.h>
+#include <fs/nfs/common/xdr_subs.h>
+#include <fs/nfs/common/nfs.h>
+#include <fs/nfs/common/nfsproto.h>
+#include <fs/nfs/common/nfsm_subs.h>
+#include <fs/nfs/server/nfs_fha_new.h>
static void fhanew_init(void *foo);
static void fhanew_uninit(void *foo);
Index: src/sys/fs/nfs/server/nfs_nfsdport.c
diff -u src/sys/fs/nfs/server/nfs_nfsdport.c:1.1.1.2 src/sys/fs/nfs/server/nfs_nfsdport.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdport.c:1.1.1.2 Fri Nov 18 07:49:14 2016
+++ src/sys/fs/nfs/server/nfs_nfsdport.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdport.c,v 1.1.1.2 2016/11/18 07:49:14 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdport.c,v 1.2 2016/12/13 21:50:32 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/fs/nfsserver/nfs_nfsdport.c 308212 2016-11-02 12:43:15Z kib "); */
-__RCSID("$NetBSD: nfs_nfsdport.c,v 1.1.1.2 2016/11/18 07:49:14 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdport.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
+#if 0
#include <sys/capsicum.h>
+#endif
/*
* Functions that perform the vfs operations required by the routines in
@@ -44,11 +46,14 @@ __RCSID("$NetBSD: nfs_nfsdport.c,v 1.1.1
* portable.
*/
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
#include <sys/hash.h>
#include <sys/sysctl.h>
+
+#if 0
#include <nlm/nlm_prot.h>
#include <nlm/nlm.h>
+#endif
FEATURE(nfsd, "NFSv4 server");
Index: src/sys/fs/nfs/server/nfs_nfsdsocket.c
diff -u src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.1.1.2 src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.1.1.2 Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/server/nfs_nfsdsocket.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdsocket.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdsocket.c,v 1.2 2016/12/13 21:50:32 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/nfsserver/nfs_nfsdsocket.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdsocket.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdsocket.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
/*
* Socket operations for use by the nfs server.
*/
#ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
extern struct nfsrvfh nfs_pubfh, nfs_rootfh;
Index: src/sys/fs/nfs/server/nfs_nfsdcache.c
diff -u src/sys/fs/nfs/server/nfs_nfsdcache.c:1.3 src/sys/fs/nfs/server/nfs_nfsdcache.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdcache.c:1.3 Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdcache.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdcache.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdcache.c,v 1.4 2016/12/13 21:50:32 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/nfsserver/nfs_nfsdcache.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdcache.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdcache.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $");
/*
* Here is the basic algorithm:
@@ -159,7 +159,7 @@ __RCSID("$NetBSD: nfs_nfsdcache.c,v 1.3
* never happens.
*/
#ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
extern struct mtx nfsrc_udpmtx;
Index: src/sys/fs/nfs/server/nfs_nfsdkrpc.c
diff -u src/sys/fs/nfs/server/nfs_nfsdkrpc.c:1.3 src/sys/fs/nfs/server/nfs_nfsdkrpc.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdkrpc.c:1.3 Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdkrpc.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdkrpc.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdkrpc.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,20 +34,26 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdkrpc.c 299203 2016-05-06 23:40:37Z pfg "); */
-__RCSID("$NetBSD: nfs_nfsdkrpc.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdkrpc.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet6.h"
+#if 0
#include "opt_kgssapi.h"
+#endif
+#endif
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
#include <rpc/rpc.h>
#include <rpc/rpcsec_gss.h>
-#include <nfs/nfs_fha.h>
-#include <fs/nfsserver/nfs_fha_new.h>
+#include <fs/nfs/common/nfs_fha.h>
+#include <fs/nfs/server/nfs_fha_new.h>
+#if 0
#include <security/mac/mac_framework.h>
+#endif
NFSDLOCKMUTEX;
NFSV4ROOTLOCKMUTEX;
@@ -177,7 +183,7 @@ nfssvc_program(struct svc_req *rqst, SVC
nd.nd_procnum != NFSPROC_NULL) {
#ifdef INET6
char b6[INET6_ADDRSTRLEN];
-#if defined(KLD_MODULE)
+#if defined(_MODULE)
/* Do not use ip6_sprintf: the nfs module should work without INET6. */
#define ip6_sprintf(buf, a) \
(snprintf((buf), sizeof(buf), "%x:%x:%x:%x:%x:%x:%x:%x", \
@@ -192,7 +198,7 @@ nfssvc_program(struct svc_req *rqst, SVC
#ifdef INET6
sin->sin_family == AF_INET6 ?
ip6_sprintf(b6, &satosin6(sin)->sin6_addr) :
-#if defined(KLD_MODULE)
+#if defined(_MODULE)
#undef ip6_sprintf
#endif
#endif
Index: src/sys/fs/nfs/server/nfs_nfsdserv.c
diff -u src/sys/fs/nfs/server/nfs_nfsdserv.c:1.3 src/sys/fs/nfs/server/nfs_nfsdserv.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdserv.c:1.3 Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdserv.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdserv.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdserv.c,v 1.4 2016/12/13 21:50:32 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/nfsserver/nfs_nfsdserv.c 299514 2016-05-12 05:03:12Z cem "); */
-__RCSID("$NetBSD: nfs_nfsdserv.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdserv.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $");
/*
* nfs version 2, 3 and 4 server calls to vnode ops
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: nfs_nfsdserv.c,v 1.3 2
*/
#ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
/* Global vars */
extern u_int32_t newnfs_false, newnfs_true;
Index: src/sys/fs/nfs/server/nfs_nfsdstate.c
diff -u src/sys/fs/nfs/server/nfs_nfsdstate.c:1.3 src/sys/fs/nfs/server/nfs_nfsdstate.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdstate.c:1.3 Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdstate.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdstate.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdstate.c,v 1.4 2016/12/13 21:50:32 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/nfsserver/nfs_nfsdstate.c 307694 2016-10-20 23:53:16Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdstate.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdstate.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $");
#ifndef APPLEKEXT
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
struct nfsrv_stablefirst nfsrv_stablefirst;
int nfsrv_issuedelegs = 0;
Index: src/sys/fs/nfs/server/nfs_nfsdsubs.c
diff -u src/sys/fs/nfs/server/nfs_nfsdsubs.c:1.3 src/sys/fs/nfs/server/nfs_nfsdsubs.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdsubs.c:1.3 Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdsubs.c Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdsubs.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */
+/* $NetBSD: nfs_nfsdsubs.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,15 +34,20 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdsubs.c 298523 2016-04-23 21:18:45Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdsubs.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdsubs.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $");
#ifndef APPLEKEXT
+
+#ifdef _KERNEL_OPT
+#include "opt_newnfs.h"
+#endif
+
/*
* These functions support the macros and help fiddle mbuf chains for
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
-#include <fs/nfs/nfsport.h>
+#include <fs/nfs/common/nfsport.h>
extern u_int32_t newnfs_true, newnfs_false;
extern int nfs_pubfhset;
