svn commit: r230446 - in stable/9/sys/fs: nfs nfsclient

[Rick Macklem]

Author: rmacklem
Date: Sun Jan 22 05:16:31 2012
New Revision: 230446
URL: http://svn.freebsd.org/changeset/base/230446

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/9/sys/fs/nfs/nfs_commonkrpc.c
  stable/9/sys/fs/nfs/nfs_commonsubs.c
  stable/9/sys/fs/nfsclient/nfs_clkrpc.c
  stable/9/sys/fs/nfsclient/nfs_clport.c
  stable/9/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonkrpc.c	Sun Jan 22 04:51:00 2012	(r230445)
+++ stable/9/sys/fs/nfs/nfs_commonkrpc.c	Sun Jan 22 05:16:31 2012	(r230446)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
  * Socket operations for use by nfs
  */
 
-#include "opt_inet6.h"
 #include "opt_kdtrace.h"
 #include "opt_kgssapi.h"
 #include "opt_nfs.h"

Modified: stable/9/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonsubs.c	Sun Jan 22 04:51:00 2012	(r230445)
+++ stable/9/sys/fs/nfs/nfs_commonsubs.c	Sun Jan 22 05:16:31 2012	(r230446)
@@ -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/9/sys/fs/nfsclient/nfs_clkrpc.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clkrpc.c	Sun Jan 22 04:51:00 2012	(r230445)
+++ stable/9/sys/fs/nfsclient/nfs_clkrpc.c	Sun Jan 22 05:16:31 2012	(r230446)
@@ -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/9/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clport.c	Sun Jan 22 04:51:00 2012	(r230445)
+++ stable/9/sys/fs/nfsclient/nfs_clport.c	Sun Jan 22 05:16:31 2012	(r230446)
@@ -34,6 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_inet6.h"
 #include "opt_kdtrace.h"
 
 #include <sys/capability.h>

Modified: stable/9/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan 22 04:51:00 2012	(r230445)
+++ stable/9/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan 22 05:16:31 2012	(r230446)
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
  */
 
 #ifndef APPLEKEXT
+#include "opt_inet6.h"
+
 #include <fs/nfs/nfsport.h>
 
 /*