d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the NFS FHA (File Handle Affinity) code from sys/nfsserver to

Browse Source 
sys/nfs, since it is now shared by the two NFS servers.

Suggested by:	rmacklem
Sponsored by:	Spectra Logic
MFC after:	2 weeks
This commit is contained in:
Kenneth D. Merry 2013-04-17 22:42:43 +00:00
parent 76fe16bb78
commit adb974068b
9 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/files
View File

@ -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

2
sys/fs/nfsserver/nfs_fha_new.c
View File

@ -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);

2
sys/fs/nfsserver/nfs_nfsdkrpc.c
View File

@ -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>

2
sys/modules/nfsd/Makefile
View File

@ -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 \

2
sys/modules/nfsserver/Makefile
View File

@ -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 \

2
sys/nfsserver/nfs_fha.c → sys/nfs/nfs_fha.c
View File

@ -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");

0
sys/nfsserver/nfs_fha.h → sys/nfs/nfs_fha.h
View File

2
sys/nfsserver/nfs_fha_old.c
View File

@ -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);

2
sys/nfsserver/nfs_srvkrpc.c
View File

@ -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>