>From 1bbe0ae80e6efbbb781412ed0d60acb108461709 Mon Sep 17 00:00:00 2001
From: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
Date: Thu, 12 May 2011 16:54:14 -0700
Subject: [PATCH 3/3] NFSRDMA: only need xprtrdma modules - remove stuff to build rest of nfs

Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
---
 ofed_scripts/Makefile  |    7 -------
 ofed_scripts/configure |   36 ------------------------------------
 ofed_scripts/makefile  |   10 ++--------
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/ofed_scripts/Makefile b/ofed_scripts/Makefile
index f86eb61..9ec90a9 100644
--- a/ofed_scripts/Makefile
+++ b/ofed_scripts/Makefile
@@ -16,11 +16,4 @@ obj-$(CONFIG_CHELSIO_T4)        += drivers/net/cxgb4/
 obj-$(CONFIG_MLX4_CORE)         += drivers/net/mlx4/
 obj-$(CONFIG_RDS)               += net/rds/
 obj-$(CONFIG_MEMTRACK)          += drivers/infiniband/debug/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/auth_gss/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += fs/nfs/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += fs/lockd/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += fs/exportfs/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += fs/nfs_common/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += fs/nfsd/
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index 9239eaa..72fa10a 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -533,47 +533,11 @@ main()
                             CONFIG_INFINIBAND_NES_DEBUG=
                         ;;
                         --with-nfsrdma-mod)
-                            CONFIG_SUNRPC="m"
-                            CONFIG_SUNRPC_GSS="m"
-                            CONFIG_RPCSEC_GSS_KRB5="m"
-                            CONFIG_RPCSEC_GSS_SPKM3="m"
                             CONFIG_SUNRPC_XPRT_RDMA="m"
-                            CONFIG_NFS_FS="m"
-                            CONFIG_NFS_V3="y"
-                            CONFIG_NFS_V3_ACL="y"
-			    CONFIG_NFS_V4="y"
-                            CONFIG_NFS_ACL_SUPPORT="m"
-                            CONFIG_NFS_DIRECTIO="y"
-			    CONFIG_EXPORTFS="m"
-                            CONFIG_LOCKD="m"
-                            CONFIG_LOCKD_V4="y"
-                            CONFIG_NFSD="m"
-                            CONFIG_NFSD_V2_ACL="y"
-                            CONFIG_NFSD_V3="y"
-                            CONFIG_NFSD_V3_ACL="y"
-                            CONFIG_NFSD_V4="y"
                             CONFIG_NFSD_RDMA="y"
                         ;;
                         --without-nfsrdma-mod)
-                            CONFIG_SUNRPC=
-                            CONFIG_SUNRPC_GSS=
-                            CONFIG_RPCSEC_GSS_KRB5=
-                            CONFIG_RPCSEC_GSS_SPKM3=
                             CONFIG_SUNRPC_XPRT_RDMA=
-                            CONFIG_NFS_FS=
-                            CONFIG_NFS_V3=
-			    CONFIG_NFS_V4=
-                            CONFIG_NFS_V3_ACL=
-                            CONFIG_NFS_ACL_SUPPORT=
-                            CONFIG_NFS_DIRECTIO=
-			    CONFIG_EXPORTFS=
-                            CONFIG_LOCKD=
-                            CONFIG_LOCKD_V4=
-                            CONFIG_NFSD=
-                            CONFIG_NFSD_V2_ACL=
-                            CONFIG_NFSD_V3=
-                            CONFIG_NFSD_V3_ACL=
-                            CONFIG_NFSD_V4=
                             CONFIG_NFSD_RDMA=
                         ;;
                         --with-modprobe|--without-modprobe)
diff --git a/ofed_scripts/makefile b/ofed_scripts/makefile
index 467339b..df3dd96 100644
--- a/ofed_scripts/makefile
+++ b/ofed_scripts/makefile
@@ -24,12 +24,6 @@ else
         export KERNEL_MEMTRACK_CFLAGS =
 endif
 
-ifeq ($(CONFIG_NFS_FS),m)
-	export KERNEL_NFS_FS_CFLAGS = -I$(CWD)/include-nfs
-else
-	export KERNEL_NFS_FS_CFLAGS = 
-endif
-
 export OPEN_ISCSI_MODULES = iscsi_tcp.ko libiscsi.ko scsi_transport_iscsi.ko
 
 configure.mk.kernel:
@@ -239,8 +233,8 @@ install_kernel_iscsi: install_modules
 install_kernel_nfsrdma: install_modules
 	# backup all the modules
 	# Copy new nfs rdma kernel modules to $(DESTDIR)/$(MODULES_DIR)/kernel
-	NFSRDMA_PATHS="fs/nfs fs/nfsd fs/lockd fs/exportfs fs/nfs_common net/sunrpc net/sunrpc/xprtrdma net/sunrpc/auth_gss"; \
-	NFSRDMA_MODS="net/sunrpc/auth_gss/auth_rpcgss.ko net/sunrpc/auth_gss/rpcsec_gss_krb5.ko net/sunrpc/auth_gss/rpcsec_gss_spkm3.ko fs/exportfs/exportfs.ko fs/lockd/lockd.ko fs/nfs_common/nfs_acl.ko fs/nfsd/nfsd.ko fs/nfs/nfs.ko net/sunrpc/sunrpc.ko net/sunrpc/xprtrdma/svcrdma.ko net/sunrpc/xprtrdma/xprtrdma.ko"; \
+	NFSRDMA_PATHS="net/sunrpc/xprtrdma"; \
+	NFSRDMA_MODS="net/sunrpc/xprtrdma/svcrdma.ko net/sunrpc/xprtrdma/xprtrdma.ko"; \
 	if [ -d $(CWD)/lib/modules/$(KVERSION)/net/sunrpc/xprtrdma ]; then \
 		for each_path in $$NFSRDMA_PATHS; do \
 			mkdir -p $(DESTDIR)/$(MODULES_DIR)/kernel/$$each_path; \
-- 
1.7.3.4

