summaryrefslogtreecommitdiffstats
path: root/sys/fs/nfs
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2012-01-08 01:54:46 +0000
committerrmacklem <rmacklem@FreeBSD.org>2012-01-08 01:54:46 +0000
commitc8986499b7c4a4fec91ca4971176d0f7f98a9600 (patch)
tree31dab9db9305e4b162f0132eb233c9b488ee819c /sys/fs/nfs
parent9b41f60a1b16e9a9ed6d1ed284e7f9d11d778d13 (diff)
downloadFreeBSD-src-c8986499b7c4a4fec91ca4971176d0f7f98a9600.zip
FreeBSD-src-c8986499b7c4a4fec91ca4971176d0f7f98a9600.tar.gz
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
Diffstat (limited to 'sys/fs/nfs')
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c1
-rw-r--r--sys/fs/nfs/nfs_commonsubs.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index eb15881..9e5bd60 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 168018c..af63c85 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>
/*
OpenPOWER on IntegriCloud