Author: rmacklem
Date: Sun Jan 22 06:00:50 2012
New Revision: 230448
URL: http://svn.freebsd.org/changeset/base/230448

Log:
  MFC: r229802
  opt_inet6.h was missing from some files in the new NFS subsystem.
  The effect of this was, for clients mounted via inet6 addresses,
  that the DRC cache would never have a hit in the server. It also
  broke NFSv4 callbacks when an inet6 address was the only one available
  in the client. This patch fixes the above, plus deletes opt_inet6.h
  from a couple of files it is not needed for.

Modified:
  stable/8/sys/fs/nfs/nfs_commonkrpc.c
  stable/8/sys/fs/nfs/nfs_commonsubs.c
  stable/8/sys/fs/nfsclient/nfs_clkrpc.c
  stable/8/sys/fs/nfsclient/nfs_clport.c
  stable/8/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonkrpc.c        Sun Jan 22 05:30:29 2012        
(r230447)
+++ stable/8/sys/fs/nfs/nfs_commonkrpc.c        Sun Jan 22 06:00:50 2012        
(r230448)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
  * Socket operations for use by nfs
  */
 
-#include "opt_inet6.h"
 #include "opt_kgssapi.h"
 #include "opt_nfs.h"
 

Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonsubs.c        Sun Jan 22 05:30:29 2012        
(r230447)
+++ stable/8/sys/fs/nfs/nfs_commonsubs.c        Sun Jan 22 06:00:50 2012        
(r230448)
@@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$");
  * copy data between mbuf chains and uio lists.
  */
 #ifndef APPLEKEXT
+#include "opt_inet6.h"
+
 #include <fs/nfs/nfsport.h>
 
 /*

Modified: stable/8/sys/fs/nfsclient/nfs_clkrpc.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clkrpc.c      Sun Jan 22 05:30:29 2012        
(r230447)
+++ stable/8/sys/fs/nfsclient/nfs_clkrpc.c      Sun Jan 22 06:00:50 2012        
(r230448)
@@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_inet6.h"
 #include "opt_kgssapi.h"
 
 #include <fs/nfs/nfsport.h>

Modified: stable/8/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clport.c      Sun Jan 22 05:30:29 2012        
(r230447)
+++ stable/8/sys/fs/nfsclient/nfs_clport.c      Sun Jan 22 06:00:50 2012        
(r230448)
@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_inet6.h"
+
 /*
  * generally, I don't like #includes inside .h files, but it seems to
  * be the easiest way to handle the port.

Modified: stable/8/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clrpcops.c    Sun Jan 22 05:30:29 2012        
(r230447)
+++ stable/8/sys/fs/nfsclient/nfs_clrpcops.c    Sun Jan 22 06:00:50 2012        
(r230448)
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
  */
 
 #ifndef APPLEKEXT
+#include "opt_inet6.h"
+
 #include <fs/nfs/nfsport.h>
 
 /*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to