diff options
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/fs/nfsserver/nfs_fha_new.c | 2 | ||||
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdkrpc.c | 2 | ||||
| -rw-r--r-- | sys/modules/nfsd/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/nfsserver/Makefile | 2 | ||||
| -rw-r--r-- | sys/nfs/nfs_fha.c (renamed from sys/nfsserver/nfs_fha.c) | 2 | ||||
| -rw-r--r-- | sys/nfs/nfs_fha.h (renamed from sys/nfsserver/nfs_fha.h) | 0 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_fha_old.c | 2 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvkrpc.c | 2 |
9 files changed, 8 insertions, 8 deletions
diff --git a/sys/conf/files b/sys/conf/files index 628bacf..6b7e94a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3203,6 +3203,7 @@ nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl nfs/nfs_common.c optional nfsclient | nfsserver nfs/nfs_diskless.c optional nfsclient nfs_root | nfscl nfs_root +nfs/nfs_fha.c optional nfsserver | nfsd nfs/nfs_lock.c optional nfsclient | nfscl | nfslockd | nfsd nfsclient/nfs_bio.c optional nfsclient nfsclient/nfs_node.c optional nfsclient @@ -3211,7 +3212,6 @@ nfsclient/nfs_subs.c optional nfsclient nfsclient/nfs_nfsiod.c optional nfsclient nfsclient/nfs_vfsops.c optional nfsclient nfsclient/nfs_vnops.c optional nfsclient -nfsserver/nfs_fha.c optional nfsserver | nfsd nfsserver/nfs_fha_old.c optional nfsserver nfsserver/nfs_serv.c optional nfsserver nfsserver/nfs_srvkrpc.c optional nfsserver 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> diff --git a/sys/modules/nfsd/Makefile b/sys/modules/nfsd/Makefile index bc0601b..2b57f30 100644 --- a/sys/modules/nfsd/Makefile +++ b/sys/modules/nfsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nfsserver ${.CURDIR}/../../nfsserver +.PATH: ${.CURDIR}/../../fs/nfsserver ${.CURDIR}/../../nfs KMOD= nfsd SRCS= vnode_if.h \ nfs_fha.c \ diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile index 9a5ead0..cdf24ed 100644 --- a/sys/modules/nfsserver/Makefile +++ b/sys/modules/nfsserver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../nfsserver +.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs KMOD= nfsserver SRCS= vnode_if.h \ nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \ diff --git a/sys/nfsserver/nfs_fha.c b/sys/nfs/nfs_fha.c index 08f2c8f..dd9ee27 100644 --- a/sys/nfsserver/nfs_fha.c +++ b/sys/nfs/nfs_fha.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sbuf.h> #include <rpc/rpc.h> -#include <nfsserver/nfs_fha.h> +#include <nfs/nfs_fha.h> static MALLOC_DEFINE(M_NFS_FHA, "NFS FHA", "NFS FHA"); diff --git a/sys/nfsserver/nfs_fha.h b/sys/nfs/nfs_fha.h index ef5ada0..ef5ada0 100644 --- a/sys/nfsserver/nfs_fha.h +++ b/sys/nfs/nfs_fha.h diff --git a/sys/nfsserver/nfs_fha_old.c b/sys/nfsserver/nfs_fha_old.c index 4161b60..82149b8 100644 --- a/sys/nfsserver/nfs_fha_old.c +++ b/sys/nfsserver/nfs_fha_old.c @@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <nfs/xdr_subs.h> #include <nfs/nfsproto.h> +#include <nfs/nfs_fha.h> #include <nfsserver/nfs.h> #include <nfsserver/nfsm_subs.h> -#include <nfsserver/nfs_fha.h> #include <nfsserver/nfs_fha_old.h> static void fhaold_init(void *foo); diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 8d566b9..db69df9 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -77,10 +77,10 @@ __FBSDID("$FreeBSD$"); #include <nfs/xdr_subs.h> #include <nfs/nfsproto.h> +#include <nfs/nfs_fha.h> #include <nfsserver/nfs.h> #include <nfsserver/nfsm_subs.h> #include <nfsserver/nfsrvcache.h> -#include <nfsserver/nfs_fha.h> #include <nfsserver/nfs_fha_old.h> #include <security/mac/mac_framework.h> |
