svn commit: r184716 - in head/sys: modules/krpc modules/nfsserver nfsserver

[Dag-Erling Smorgrav]

Author: des
Date: Thu Nov  6 10:53:35 2008
New Revision: 184716
URL: http://svn.freebsd.org/changeset/base/184716

Log:
  Unbreak NFS.
  
  Pointy hat to:	dfr

Modified:
  head/sys/modules/krpc/Makefile
  head/sys/modules/nfsserver/Makefile
  head/sys/nfsserver/nfs_srvsubs.c

Modified: head/sys/modules/krpc/Makefile
==============================================================================
--- head/sys/modules/krpc/Makefile	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/modules/krpc/Makefile	Thu Nov  6 10:53:35 2008	(r184716)
@@ -16,6 +16,7 @@ SRCS=	auth_none.c \
 	rpc_prot.c \
 	rpcb_clnt.c \
 	rpcb_prot.c \
+	replay.c \
 	svc.c \
 	svc_auth.c \
 	svc_auth_unix.c \

Modified: head/sys/modules/nfsserver/Makefile
==============================================================================
--- head/sys/modules/nfsserver/Makefile	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/modules/nfsserver/Makefile	Thu Nov  6 10:53:35 2008	(r184716)
@@ -3,8 +3,8 @@
 .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver
 SRCS=	vnode_if.h \
-	nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c nfs_srvsubs.c \
-	nfs_syscalls.c nfs_common.c \
+	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \
+	nfs_srvsubs.c nfs_syscalls.c nfs_common.c \
 	opt_mac.h \
 	opt_nfs.h
 SRCS+=	opt_inet6.h

Modified: head/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- head/sys/nfsserver/nfs_srvsubs.c	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/nfsserver/nfs_srvsubs.c	Thu Nov  6 10:53:35 2008	(r184716)
@@ -596,6 +596,7 @@ DECLARE_MODULE(nfsserver, nfsserver_mod,
 
 /* So that loader and kldload(2) can find us, wherever we are.. */
 MODULE_VERSION(nfsserver, 1);
+MODULE_DEPEND(nfsserver, krpc, 1, 1, 1);
 
 /*
  * Set up nameidata for a lookup() call and do it.