[src/trunk]: src/sys/fs/nfs/nlm Update for location of newnfs headers, clean ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/fs/nfs/nlm Update for location of newnfs headers, clean ...
From: pgoyette <pgoyette%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 20:42:15 +0000
details:   https://anonhg.NetBSD.org/src/rev/2751d8de3a63
branches:  trunk
changeset: 349536:2751d8de3a63
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Dec 13 21:58:17 2016 +0000

description:
Update for location of newnfs headers, clean up some other #include

diffstat:

 sys/fs/nfs/nlm/nlm_advlock.c     |  14 +++++++-------
 sys/fs/nfs/nlm/nlm_prot_clnt.c   |   6 +++---
 sys/fs/nfs/nlm/nlm_prot_impl.c   |  26 ++++++++++++++++----------
 sys/fs/nfs/nlm/nlm_prot_server.c |   8 ++++----
 sys/fs/nfs/nlm/nlm_prot_svc.c    |   8 ++++----
 sys/fs/nfs/nlm/nlm_prot_xdr.c    |   7 ++++---
 sys/fs/nfs/nlm/sm_inter_xdr.c    |   6 +++---
 7 files changed, 41 insertions(+), 34 deletions(-)

diffs (224 lines):

diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_advlock.c
--- a/sys/fs/nfs/nlm/nlm_advlock.c      Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_advlock.c      Tue Dec 13 21:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlm_advlock.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $     */
+/*     $NetBSD: nlm_advlock.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $ */
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson <dfr%rabson.org@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_advlock.c 302216 2016-06-26 20:08:42Z kib "); */
-__RCSID("$NetBSD: nlm_advlock.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nlm_advlock.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -48,12 +48,12 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 
-#include <nfs/nfsproto.h>
-#include <nfsclient/nfs.h>
-#include <nfsclient/nfsmount.h>
+#include <fs/nfs/common/nfsproto.h>
+#include <fs/nfs/client/nfs.h>
+#include <fs/nfs/client/nfsmount.h>
 
-#include <nlm/nlm_prot.h>
-#include <nlm/nlm.h>
+#include <fs/nfs/nlm/nlm_prot.h>
+#include <fs/nfs/nlm/nlm.h>
 
 /*
  * We need to keep track of the svid values used for F_FLOCK locks.
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_prot_clnt.c
--- a/sys/fs/nfs/nlm/nlm_prot_clnt.c    Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_prot_clnt.c    Tue Dec 13 21:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlm_prot_clnt.c,v 1.1.1.1 2013/09/30 07:19:43 dholland Exp $   */
+/*     $NetBSD: nlm_prot_clnt.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $       */
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
@@ -9,7 +9,7 @@
 #include <sys/mutex.h>
 #include <sys/systm.h>
 
-#include <nlm/nlm_prot.h>
+#include <fs/nfs/nlm/nlm_prot.h>
 #include <sys/cdefs.h>
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
@@ -17,7 +17,7 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_clnt.c 180025 2008-06-26 10:21:54Z dfr "); */
-__RCSID("$NetBSD: nlm_prot_clnt.c,v 1.1.1.1 2013/09/30 07:19:43 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_clnt.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 enum clnt_stat 
 nlm_sm_notify_0(struct nlm_sm_status *argp, void *clnt_res, CLIENT *clnt, struct rpc_callextra *ext, struct timeval timo)
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_prot_impl.c
--- a/sys/fs/nfs/nlm/nlm_prot_impl.c    Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_prot_impl.c    Tue Dec 13 21:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlm_prot_impl.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $       */
+/*     $NetBSD: nlm_prot_impl.c,v 1.4 2016/12/13 21:58:17 pgoyette Exp $       */
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson <dfr%rabson.org@localhost>
@@ -26,11 +26,13 @@
  * SUCH DAMAGE.
  */
 
+#ifdef _KERNEL_OPT
 #include "opt_inet6.h"
+#endif
 
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_impl.c 302216 2016-06-26 20:08:42Z kib "); */
-__RCSID("$NetBSD: nlm_prot_impl.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $");
+__RCSID("$NetBSD: nlm_prot_impl.c,v 1.4 2016/12/13 21:58:17 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/fail.h>
@@ -40,9 +42,6 @@
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#if __FreeBSD_version >= 700000
-#include <sys/priv.h>
-#endif
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -56,12 +55,19 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 
-#include <nfs/nfsproto.h>
-#include <nfs/nfs_lock.h>
+#if 0
+#if __FreeBSD_version >= 700000
+#include <sys/priv.h>
+#endif
+#endif
 
-#include <nlm/nlm_prot.h>
-#include <nlm/sm_inter.h>
-#include <nlm/nlm.h>
+#include <fs/nfs/common/nfsproto.h>
+#include <fs/nfs/common/nfs_lock.h>
+
+#include <fs/nfs/nlm/nlm_prot.h>
+#include <fs/nfs/nlm/sm_inter.h>
+#include <fs/nfs/nlm/nlm.h>
+
 #include <rpc/rpc_com.h>
 #include <rpc/rpcb_prot.h>
 
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_prot_server.c
--- a/sys/fs/nfs/nlm/nlm_prot_server.c  Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_prot_server.c  Tue Dec 13 21:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlm_prot_server.c,v 1.1.1.1 2013/09/30 07:19:45 dholland Exp $ */
+/*     $NetBSD: nlm_prot_server.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $     */
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson <dfr%rabson.org@localhost>
@@ -33,14 +33,14 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_server.c 197840 2009-10-07 19:50:14Z zml "); */
-__RCSID("$NetBSD: nlm_prot_server.c,v 1.1.1.1 2013/09/30 07:19:45 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_server.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <nlm/nlm_prot.h>
-#include <nlm/nlm.h>
+#include <fs/nfs/nlm/nlm_prot.h>
+#include <fs/nfs/nlm/nlm.h>
 
 /**********************************************************************/
 
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_prot_svc.c
--- a/sys/fs/nfs/nlm/nlm_prot_svc.c     Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_prot_svc.c     Tue Dec 13 21:58:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlm_prot_svc.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $    */
+/*     $NetBSD: nlm_prot_svc.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $        */
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson <dfr%rabson.org@localhost>
@@ -29,8 +29,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <nlm/nlm_prot.h>
-#include <nlm/nlm.h>
+#include <fs/nfs/nlm/nlm_prot.h>
+#include <fs/nfs/nlm/nlm.h>
 
 #include <sys/cdefs.h>
 #ifndef lint
@@ -39,7 +39,7 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_svc.c 184886 2008-11-12 15:30:30Z dfr "); */
-__RCSID("$NetBSD: nlm_prot_svc.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_svc.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 void nlm_prog_0(struct svc_req *rqstp, SVCXPRT *transp);
 void nlm_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/nlm_prot_xdr.c
--- a/sys/fs/nfs/nlm/nlm_prot_xdr.c     Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/nlm_prot_xdr.c     Tue Dec 13 21:58:17 2016 +0000
@@ -1,10 +1,11 @@
-/*     $NetBSD: nlm_prot_xdr.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $    */
+/*     $NetBSD: nlm_prot_xdr.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $        */
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
 
-#include <nlm/nlm_prot.h>
+#include <fs/nfs/nlm/nlm_prot.h>
+
 #include <sys/cdefs.h>
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
@@ -12,7 +13,7 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_xdr.c 177685 2008-03-28 09:50:32Z dfr "); */
-__RCSID("$NetBSD: nlm_prot_xdr.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_xdr.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 bool_t
 xdr_nlm_stats(XDR *xdrs, nlm_stats *objp)
diff -r 432a2ca62540 -r 2751d8de3a63 sys/fs/nfs/nlm/sm_inter_xdr.c
--- a/sys/fs/nfs/nlm/sm_inter_xdr.c     Tue Dec 13 21:50:32 2016 +0000
+++ b/sys/fs/nfs/nlm/sm_inter_xdr.c     Tue Dec 13 21:58:17 2016 +0000
@@ -1,13 +1,13 @@
-/*     $NetBSD: sm_inter_xdr.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $    */
+/*     $NetBSD: sm_inter_xdr.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $        */
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
 
-#include <nlm/sm_inter.h>
+#include <fs/nfs/nlm/sm_inter.h>
 #include <sys/cdefs.h>
 /* __FBSDID("FreeBSD: head/sys/nlm/sm_inter_xdr.c 177685 2008-03-28 09:50:32Z dfr "); */
-__RCSID("$NetBSD: sm_inter_xdr.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $");
+__RCSID("$NetBSD: sm_inter_xdr.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 bool_t
 xdr_sm_name(XDR *xdrs, sm_name *objp)
Prev by Date: [src/trunk]: src/sys/arch wildcard speaker attachments, now that we can handl...
Next by Date: [src/trunk]: src/sys/fs/nfs/server Update locations for new nfs header files.
Previous by Thread: [src/trunk]: src/sys/arch wildcard speaker attachments, now that we can handl...
Next by Thread: [src/trunk]: src/sys/fs/nfs/server Update locations for new nfs header files.
Indexes:
Home | Main Index | Thread Index | Old Index