From f7258644907a2ce037cb175a384580ec00144716 Mon Sep 17 00:00:00 2001
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 8 Jan 2012 01:54:46 +0000
Subject: [PATCH] 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.

MFC after:	2 weeks
---
 sys/fs/nfs/nfs_commonkrpc.c     | 1 -
 sys/fs/nfs/nfs_commonsubs.c     | 2 ++
 sys/fs/nfsclient/nfs_clkrpc.c   | 1 -
 sys/fs/nfsclient/nfs_clport.c   | 1 +
 sys/fs/nfsclient/nfs_clrpcops.c | 2 ++
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index eb158810486..9e5bd60def7 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -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"
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 168018c1467..af63c854bb1 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -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>
 
 /*
diff --git a/sys/fs/nfsclient/nfs_clkrpc.c b/sys/fs/nfsclient/nfs_clkrpc.c
index 0cd41b382aa..fceb36d173e 100644
--- a/sys/fs/nfsclient/nfs_clkrpc.c
+++ b/sys/fs/nfsclient/nfs_clkrpc.c
@@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_inet6.h"
 #include "opt_kgssapi.h"
 
 #include <fs/nfs/nfsport.h>
diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c
index acbfa6ceda8..bf48beb9718 100644
--- a/sys/fs/nfsclient/nfs_clport.c
+++ b/sys/fs/nfsclient/nfs_clport.c
@@ -34,6 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_inet6.h"
 #include "opt_kdtrace.h"
 
 #include <sys/capability.h>
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 05ff2ec5bb8..96bf083a362 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
  */
 
 #ifndef APPLEKEXT
+#include "opt_inet6.h"
+
 #include <fs/nfs/nfsport.h>
 
 /*