diff options
author | ken <ken@FreeBSD.org> | 2013-04-17 22:42:43 +0000 |
---|---|---|
committer | ken <ken@FreeBSD.org> | 2013-04-17 22:42:43 +0000 |
commit | 1ab8c6ab7f2de005d4d3703633edb46f400b5a11 (patch) | |
tree | f3729ef72b2aee6ef1f97e5a9304f9692430b7be /sys/fs | |
parent | 64d828dacb80393b9972a63775bc9a9ec7c26bfd (diff) | |
download | FreeBSD-src-1ab8c6ab7f2de005d4d3703633edb46f400b5a11.zip FreeBSD-src-1ab8c6ab7f2de005d4d3703633edb46f400b5a11.tar.gz |
Move the NFS FHA (File Handle Affinity) code from sys/nfsserver to
sys/nfs, since it is now shared by the two NFS servers.
Suggested by: rmacklem
Sponsored by: Spectra Logic
MFC after: 2 weeks
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/nfsserver/nfs_fha_new.c | 2 | ||||
-rw-r--r-- | sys/fs/nfsserver/nfs_nfsdkrpc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/nfsserver/nfs_fha_new.c b/sys/fs/nfsserver/nfs_fha_new.c index 7e461e7..c05ad28 100644 --- a/sys/fs/nfsserver/nfs_fha_new.c +++ b/sys/fs/nfsserver/nfs_fha_new.c @@ -30,11 +30,11 @@ __FBSDID("$FreeBSD$"); #include <fs/nfs/nfsport.h> #include <rpc/rpc.h> +#include <nfs/nfs_fha.h> #include <fs/nfs/xdr_subs.h> #include <fs/nfs/nfs.h> #include <fs/nfs/nfsproto.h> #include <fs/nfs/nfsm_subs.h> -#include <nfsserver/nfs_fha.h> #include <fs/nfsserver/nfs_fha_new.h> static void fhanew_init(void *foo); diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 8fdcdac..9185b135 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include <nfsserver/nfs_fha.h> +#include <nfs/nfs_fha.h> #include <fs/nfsserver/nfs_fha_new.h> #include <security/mac/mac_framework.h> |