Module Name: src
Committed By: pgoyette
Date: Tue Dec 13 22:41:46 UTC 2016
Modified Files:
src/sys/fs/nfs/common: nfs_diskless.c nfs_fha.c nfs_lock.c nfs_nfssvc.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_diskless.c \
src/sys/fs/nfs/common/nfs_fha.c src/sys/fs/nfs/common/nfs_lock.c \
src/sys/fs/nfs/common/nfs_nfssvc.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_diskless.c
diff -u src/sys/fs/nfs/common/nfs_diskless.c:1.1.1.2 src/sys/fs/nfs/common/nfs_diskless.c:1.2
--- src/sys/fs/nfs/common/nfs_diskless.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_diskless.c Tue Dec 13 22:41:46 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_diskless.c,v 1.1.1
#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 @@ decode_nfshandle(char *ev, u_char *fh, i
}
}
-#if !defined(BOOTP_NFSROOT)
+#if !defined(NEW_NFS_BOOT_BOOTP)
static void
nfs_rootconf(void)
{
Index: src/sys/fs/nfs/common/nfs_fha.c
diff -u src/sys/fs/nfs/common/nfs_fha.c:1.1.1.2 src/sys/fs/nfs/common/nfs_fha.c:1.2
--- src/sys/fs/nfs/common/nfs_fha.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_fha.c Tue Dec 13 22:41:46 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_fha.c,v 1.1.1.2 20
#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");
Index: src/sys/fs/nfs/common/nfs_lock.c
diff -u src/sys/fs/nfs/common/nfs_lock.c:1.1.1.2 src/sys/fs/nfs/common/nfs_lock.c:1.2
--- src/sys/fs/nfs/common/nfs_lock.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_lock.c Tue Dec 13 22:41:46 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_lock.c,v 1.1.1.2 2
#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);
Index: src/sys/fs/nfs/common/nfs_nfssvc.c
diff -u src/sys/fs/nfs/common/nfs_nfssvc.c:1.1.1.2 src/sys/fs/nfs/common/nfs_nfssvc.c:1.2
--- src/sys/fs/nfs/common/nfs_nfssvc.c:1.1.1.2 Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_nfssvc.c Tue Dec 13 22:41:46 2016
@@ -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 @@ __RCSID("$NetBSD: nfs_nfssvc.c,v 1.1.1.2
#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;
