Module Name:src
Committed By: pgoyette
Date: Tue Dec 13 21:58:17 UTC 2016
Modified Files:
src/sys/fs/nfs/nlm: nlm_advlock.c nlm_prot_clnt.c nlm_prot_impl.c
nlm_prot_server.c nlm_prot_svc.c nlm_prot_xdr.c sm_inter_xdr.c
Log Message:
Update for location of newnfs headers, clean up some other #include
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/nlm/nlm_advlock.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/nlm/nlm_prot_clnt.c \
src/sys/fs/nfs/nlm/nlm_prot_server.c src/sys/fs/nfs/nlm/nlm_prot_svc.c \
src/sys/fs/nfs/nlm/nlm_prot_xdr.c src/sys/fs/nfs/nlm/sm_inter_xdr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/nlm/nlm_prot_impl.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/nlm/nlm_advlock.c
diff -u src/sys/fs/nfs/nlm/nlm_advlock.c:1.1.1.2 src/sys/fs/nfs/nlm/nlm_advlock.c:1.2
--- src/sys/fs/nfs/nlm/nlm_advlock.c:1.1.1.2 Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/nlm/nlm_advlock.c Tue Dec 13 21:58:17 2016
@@ -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
@@ -28,7 +28,7 @@
#include
/* __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
#include
@@ -48,12 +48,12 @@ __RCSID("$NetBSD: nlm_advlock.c,v 1.1.1.
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
-#include
-#include
+#include
+#include
/*
* We need to keep track of the svid values used for F_FLOCK locks.
Index: src/sys/fs/nfs/nlm/nlm_prot_clnt.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.1.1.1 Mon Sep 30 07:19:43 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_clnt.c Tue Dec 13 21:58:17 2016
@@ -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
#include
-#include
+#include
#include
#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)
Index: src/sys/fs/nfs/nlm/nlm_prot_server.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_server.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_server.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_server.c:1.1.1.1 Mon Sep 30 07:19:45 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_server.c Tue Dec 13 21:58:17 2016
@@ -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
@@ -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
#include
#include
-#include
-#include
+#include
+#include
/**/
Index: src/sys/fs/nfs/nlm/nlm_prot_svc.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.1.1.1 Mon Sep 30 07:19:46 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_svc.c Tue Dec 13 21:58:17 2016
@@ -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
@@ -29,8 +29,8 @@
#include
#include
-#include
-#include
+#include
+#include
#include
#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 */
/*