From ea808540e59e8a4774ec774ad0134970d30ecdb1 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 5 Jan 2015 11:35:14 +0200 Subject: [PATCH] configure/makefile: Cleanup NFSRDMA configuration parameters Signed-off-by: Vladimir Sokolovsky --- configure | 169 +++++++++--------------------------------------------- makefile | 4 +- 2 files changed, 29 insertions(+), 144 deletions(-) diff --git a/configure b/configure index 372b866..c9fb221 100755 --- a/configure +++ b/configure @@ -666,11 +666,13 @@ main() ;; --with-nfsrdma-mod) CONFIG_SUNRPC_XPRT_RDMA="m" - CONFIG_NFSD_RDMA="y" + CONFIG_SUNRPC_XPRT_RDMA_CLIENT="m" + CONFIG_SUNRPC_XPRT_RDMA_SERVER="m" ;; --without-nfsrdma-mod) CONFIG_SUNRPC_XPRT_RDMA= - CONFIG_NFSD_RDMA= + CONFIG_SUNRPC_XPRT_RDMA_CLIENT= + CONFIG_SUNRPC_XPRT_RDMA_SERVER= ;; --with-modprobe|--without-modprobe) ;; @@ -778,31 +780,10 @@ CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES:-''} CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA:-''} CONFIG_BE2NET=${CONFIG_BE2NET:-''} -CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA:-''} -CONFIG_SUNRPC=${CONFIG_SUNRPC:-''} -CONFIG_SUNRPC_GSS=${CONFIG_SUNRPC_GSS:-''} -CONFIG_RPCSEC_GSS_KRB5=${CONFIG_RPCSEC_GSS_KRB5:-''} -CONFIG_RPCSEC_GSS_SPKM3=${CONFIG_RPCSEC_GSS_SPKM3:-''} - -CONFIG_NFS_FS=${CONFIG_NFS_FS:-''} -CONFIG_NFS_V3=${CONFIG_NFS_V3:-''} -CONFIG_NFS_V3_ACL=${CONFIG_NFS_V3_ACL:-''} -CONFIG_NFS_V4=${CONFIG_NFS_V4:-''} -CONFIG_NFS_ACL_SUPPORT=${CONFIG_NFS_ACL_SUPPORT:-''} -CONFIG_NFS_DIRECTIO=${CONFIG_NFS_DIRECTIO:-''} - -CONFIG_EXPORTFS=${CONFIG_EXPORTFS:-''} - -CONFIG_LOCKD=${CONFIG_LOCKD:-''} -CONFIG_LOCKD_V4=${CONFIG_LOCKD_V4:-''} - -CONFIG_NFSD=${CONFIG_NFSD:-''} -CONFIG_NFSD_V2_ACL=${CONFIG_NFSD_V2_ACL:-''} -CONFIG_NFSD_V3=${CONFIG_NFSD_V3:-''} -CONFIG_NFSD_V3_ACL=${CONFIG_NFSD_V3_ACL:-''} -CONFIG_NFSD_V4=${CONFIG_NFSD_V4:-''} -CONFIG_NFSD_RDMA=${CONFIG_NFSD_RDMA:-''} - +CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA:-''} +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=${CONFIG_SUNRPC_XPRT_RDMA_CLIENT:-''} +CONFIG_SUNRPC_XPRT_RDMA_SERVER=${CONFIG_SUNRPC_XPRT_RDMA_SERVER:-''} +CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS:-''} CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA:-''} CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY:-''} CONFIG_INFINIBAND_SDP_RECV_ZCOPY=${CONFIG_INFINIBAND_SDP_RECV_ZCOPY:-''} @@ -912,26 +893,8 @@ CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA} CONFIG_BE2NET=${CONFIG_BE2NET} CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA} -CONFIG_SUNRPC=${CONFIG_SUNRPC} -CONFIG_SUNRPC_GSS=${CONFIG_SUNRPC_GSS} -CONFIG_RPCSEC_GSS_KRB5=${CONFIG_RPCSEC_GSS_KRB5} -CONFIG_RPCSEC_GSS_SPKM3=${CONFIG_RPCSEC_GSS_SPKM3} - -CONFIG_NFS_FS=${CONFIG_NFS_FS} -CONFIG_NFS_V3=${CONFIG_NFS_V3} -CONFIG_NFS_V3_ACL=${CONFIG_NFS_V3_ACL} -CONFIG_NFS_V4=${CONFIG_NFS_V4} -CONFIG_NFS_ACL_SUPPORT=${CONFIG_NFS_ACL_SUPPORT} -CONFIG_NFS_DIRECTIO=${CONFIG_NFS_DIRECTIO} -CONFIG_EXPORTFS=${CONFIG_EXPORTFS} -CONFIG_LOCKD=${CONFIG_LOCKD} -CONFIG_LOCKD_V4=${CONFIG_LOCKD_V4} -CONFIG_NFSD=${CONFIG_NFSD} -CONFIG_NFSD_V2_ACL=${CONFIG_NFSD_V2_ACL} -CONFIG_NFSD_V3=${CONFIG_NFSD_V3} -CONFIG_NFSD_V3_ACL=${CONFIG_NFSD_V3_ACL} -CONFIG_NFSD_V4=${CONFIG_NFSD_V4} -CONFIG_NFSD_RDMA=${CONFIG_NFSD_RDMA} +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=${CONFIG_SUNRPC_XPRT_RDMA_CLIENT} +CONFIG_SUNRPC_XPRT_RDMA_SERVER=${CONFIG_SUNRPC_XPRT_RDMA_SERVER} CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA} @@ -1243,47 +1206,20 @@ else fi if [ "X${CONFIG_SUNRPC_XPRT_RDMA}" == "Xm" ]; then DEFINE_SUNRPC_XPRT_RDMA="#undef CONFIG_SUNRPC_XPRT_RDMA\n#define CONFIG_SUNRPC_XPRT_RDMA 1" - DEFINE_SUNRPC="#undef CONFIG_SUNRPC\n#define CONFIG_SUNRPC 1" - DEFINE_SUNRPC_GSS="#undef CONFIG_SUNRPC_GSS\n#define CONFIG_SUNRPC_GSS 1" - DEFINE_RPCSEC_GSS_KRB5="#undef CONFIG_RPCSEC_GSS_KRB5\n#define CONFIG_RPCSEC_GSS_KRB5 1" - DEFINE_RPCSEC_GSS_SPKM3="#undef CONFIG_RPCSEC_GSS_SPKM3\n#define CONFIG_RPCSEC_GSS_SPKM3 1" - DEFINE_NFS_FS="#undef CONFIG_NFS_FS\n#define CONFIG_NFS_FS 1" - DEFINE_NFS_V3="#undef CONFIG_NFS_V3\n#define CONFIG_NFS_V3 1" - DEFINE_NFS_V3_ACL="#undef CONFIG_NFS_V3_ACL\n#define CONFIG_NFS_V3_ACL 1" - DEFINE_NFS_V4="#undef CONFIG_NFS_V4\n#define CONFIG_NFS_V4 1" - DEFINE_NFS_ACL_SUPPORT="#undef CONFIG_NFS_ACL_SUPPORT\n#define CONFIG_NFS_ACL_SUPPORT 1" - DEFINE_NFS_DIRECTIO="#undef CONFIG_NFS_DIRECTIO\n#define CONFIG_NFS_DIRECTIO 1" - DEFINE_EXPORTFS="#undef CONFIG_EXPORTFS\n#define CONFIG_EXPORTFS 1" - DEFINE_LOCKD="#undef CONFIG_LOCKD\n#define CONFIG_LOCKD 1" - DEFINE_LOCKD_V4="#undef CONFIG_LOCKD_V4\n#define CONFIG_LOCKD_V4 1" - DEFINE_NFSD="#undef CONFIG_NFSD\n#define CONFIG_NFSD 1" - DEFINE_NFSD_V2_ACL="#undef CONFIG_NFSD_V2_ACL\n#define CONFIG_NFSD_V2_ACL 1" - DEFINE_NFSD_V3="#undef CONFIG_NFSD_V3\n#define CONFIG_NFSD_V3 1" - DEFINE_NFSD_V3_ACL="#undef CONFIG_NFSD_V3_ACL\n#define CONFIG_NFSD_V3_ACL 1" - DEFINE_NFSD_V4="#undef CONFIG_NFSD_V4\n#define CONFIG_NFSD_V4 1" - DEFINE_NFSD_RDMA="#undef CONFIG_NFSD_RDMA\n#define CONFIG_NFSD_RDMA 1" else DEFINE_SUNRPC_XPRT_RDMA="/* CONFIG_SUNRPC_XPRT_RDMA is not set */" - DEFINE_SUNRPC="/* CONFIG_SUNRPC is not set */" - DEFINE_SUNRPC_GSS="/* CONFIG_SUNRPC_GSS is not set */" - DEFINE_RPCSEC_GSS_KRB5="/* CONFIG_RPCSEC_GSS_KRB5 is not set */" - DEFINE_RPCSEC_GSS_SPKM3="/* CONFIG_RPCSEC_GSS_SPKM3 is not set */" - DEFINE_NFS_FS="/* CONFIG_NFS_FS is not set */" - DEFINE_NFS_V3="/* CONFIG_NFS_V3 is not set */" - DEFINE_NFS_V3_ACL="/* CONFIG_NFS_V3_ACL is not set */" - DEFINE_NFS_V4="/* CONFIG_NFS_V4 is not set */" - DEFINE_NFS_ACL_SUPPORT="/* CONFIG_NFS_ACL_SUPPORT is not set */" - DEFINE_NFS_DIRECTIO="/* CONFIG_NFS_DIRECTIO is not set */" - DEFINE_EXPORTFS="/* CONFIG_EXPORTFS is not set */" - DEFINE_LOCKD="/* CONFIG_LOCKD is not set */" - DEFINE_LOCKD_V4="/* CONFIG_LOCKD_V4 is not set */" - DEFINE_NFSD="/* CONFIG_NFSD is not set */" - DEFINE_NFSD_V2_ACL="/* CONFIG_NFSD_V2_ACL is not set */" - DEFINE_NFSD_V3="/* CONFIG_NFSD_V3 is not set */" - DEFINE_NFSD_V3_ACL="/* CONFIG_NFSD_V3_ACL is not set */" - DEFINE_NFSD_V4="/* CONFIG_NFSD_V4 is not set */" - DEFINE_NFSD_RDMA="/* CONFIG_NFSD_RDMA is not set */" fi +if [ "X${CONFIG_SUNRPC_XPRT_RDMA_CLIENT}" == "Xm" ]; then + DEFINE_SUNRPC_XPRT_RDMA_CLIENT="#undef CONFIG_SUNRPC_XPRT_RDMA_CLIENT\n#define CONFIG_SUNRPC_XPRT_RDMA_CLIENT 1" +else + DEFINE_SUNRPC_XPRT_RDMA_CLIENT="/* CONFIG_SUNRPC_XPRT_RDMA_CLIENT is not set */" +fi +if [ "X${CONFIG_SUNRPC_XPRT_RDMA_SERVER}" == "Xm" ]; then + DEFINE_SUNRPC_XPRT_RDMA_SERVER="#undef CONFIG_SUNRPC_XPRT_RDMA_SERVER\n#define CONFIG_SUNRPC_XPRT_RDMA_SERVER 1" +else + DEFINE_SUNRPC_XPRT_RDMA_SERVER="/* CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set */" +fi + cat >> ${AUTOCONF_H} << EOFAUTOCONF #ifndef __OFED_BUILD__ #include_next @@ -1310,25 +1246,8 @@ $(echo -e "${DEFINE_INFINIBAND_OCRDMA}" | grep -v undef) $(echo -e "${DEFINE_BE2NET}" | grep -v undef) $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}" | grep -v undef) -$(echo -e "${DEFINE_SUNRPC}" | grep -v undef) -$(echo -e "${DEFINE_SUNRPC_GSS}" | grep -v undef) -$(echo -e "${DEFINE_RPCSEC_GSS_KRB5}" | grep -v undef) -$(echo -e "${DEFINE_RPCSEC_GSS_SPKM3}" | grep -v undef) -$(echo -e "${DEFINE_NFS_FS}" | grep -v undef) -$(echo -e "${DEFINE_NFS_V3}" | grep -v undef) -$(echo -e "${DEFINE_NFS_V3_ACL}" | grep -v undef) -$(echo -e "${DEFINE_NFS_V4}" | grep -v undef) -$(echo -e "${DEFINE_NFS_ACL_SUPPORT}" | grep -v undef) -$(echo -e "${DEFINE_NFS_DIRECTIO}" | grep -v undef) -$(echo -e "${DEFINE_EXPORTFS}" | grep -v undef) -$(echo -e "${DEFINE_LOCKD}" | grep -v undef) -$(echo -e "${DEFINE_LOCKD_V4}" | grep -v undef) -$(echo -e "${DEFINE_NFSD}" | grep -v undef) -$(echo -e "${DEFINE_NFSD_V2_ACL}" | grep -v undef) -$(echo -e "${DEFINE_NFSD_V3}" | grep -v undef) -$(echo -e "${DEFINE_NFSD_V3_ACL}" | grep -v undef) -$(echo -e "${DEFINE_NFSD_V4}" | grep -v undef) -$(echo -e "${DEFINE_NFSD_RDMA}" | grep -v undef) +$(echo -e "${DEFINE_SUNRPC_XPRT_RDMA_CLIENT}" | grep -v undef) +$(echo -e "${DEFINE_SUNRPC_XPRT_RDMA_SERVER}" | grep -v undef) $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG}" | grep -v undef) $(echo -e "${DEFINE_INFINIBAND_ISERT}" | grep -v undef) @@ -1424,25 +1343,8 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef) #undef CONFIG_BE2NET #undef CONFIG_SUNRPC_XPRT_RDMA -#undef CONFIG_SUNRPC -#undef CONFIG_SUNRPC_GSS -#undef CONFIG_RPCSEC_GSS_KRB5 -#undef CONFIG_RPCSEC_GSS_SPKM3 -#undef CONFIG_NFS_FS -#undef CONFIG_NFS_V3 -#undef CONFIG_NFS_V3_ACL -#undef CONFIG_NFS_V4 -#undef CONFIG_NFS_ACL_SUPPORT -#undef CONFIG_NFS_DIRECTIO -#undef CONFIG_EXPORTFS -#undef CONFIG_LOCKD -#undef CONFIG_LOCKD_V4 -#undef CONFIG_NFSD -#undef CONFIG_NFSD_V2_ACL -#undef CONFIG_NFSD_V3 -#undef CONFIG_NFSD_V3_ACL -#undef CONFIG_NFSD_V4 -#undef CONFIG_NFSD_RDMA +#undef CONFIG_SUNRPC_XPRT_RDMA_CLIENT +#undef CONFIG_SUNRPC_XPRT_RDMA_SERVER #undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA @@ -1478,25 +1380,8 @@ $(echo -e "${DEFINE_INFINIBAND_OCRDMA}") $(echo -e "${DEFINE_BE2NET}") $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}") -$(echo -e "${DEFINE_SUNRPC}") -$(echo -e "${DEFINE_SUNRPC_GSS}") -$(echo -e "${DEFINE_RPCSEC_GSS_KRB5}") -$(echo -e "${DEFINE_RPCSEC_GSS_SPKM3}") -$(echo -e "${DEFINE_NFS_FS}") -$(echo -e "${DEFINE_NFS_V3}") -$(echo -e "${DEFINE_NFS_V3_ACL}") -$(echo -e "${DEFINE_NFS_V4}") -$(echo -e "${DEFINE_NFS_ACL_SUPPORT}") -$(echo -e "${DEFINE_NFS_DIRECTIO}") -$(echo -e "${DEFINE_EXPORTFS}") -$(echo -e "${DEFINE_LOCKD}") -$(echo -e "${DEFINE_LOCKD_V4}") -$(echo -e "${DEFINE_NFSD}") -$(echo -e "${DEFINE_NFSD_V2_ACL}") -$(echo -e "${DEFINE_NFSD_V3}") -$(echo -e "${DEFINE_NFSD_V3_ACL}") -$(echo -e "${DEFINE_NFSD_V4}") -$(echo -e "${DEFINE_NFSD_RDMA}") +$(echo -e "${DEFINE_SUNRPC_XPRT_RDMA_CLIENT}") +$(echo -e "${DEFINE_SUNRPC_XPRT_RDMA_SERVER}") $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG}") $(echo -e "${DEFINE_INFINIBAND_ISERT}") diff --git a/makefile b/makefile index 9f0e2cf..a513d92 100644 --- a/makefile +++ b/makefile @@ -134,7 +134,8 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) CONFIG_INFINIBAND_SCIF=$(CONFIG_INFINIBAND_SCIF) \ CONFIG_INFINIBAND_AMSO1100=$(CONFIG_INFINIBAND_AMSO1100) \ CONFIG_SUNRPC_XPRT_RDMA=$(CONFIG_SUNRPC_XPRT_RDMA) \ - CONFIG_NFSD_RDMA=$(CONFIG_NFSD_RDMA) \ + CONFIG_SUNRPC_XPRT_RDMA_CLIENT=$(CONFIG_SUNRPC_XPRT_RDMA_CLIENT) \ + CONFIG_SUNRPC_XPRT_RDMA_SERVER=$(CONFIG_SUNRPC_XPRT_RDMA_SERVER) \ CONFIG_INFINIBAND_OCRDMA=$(CONFIG_INFINIBAND_OCRDMA) \ CONFIG_BE2NET=$(CONFIG_BE2NET) \ CONFIG_INFINIBAND_ISERT=$(CONFIG_INFINIBAND_ISERT) \ @@ -149,7 +150,6 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) -include $(CWD)/include/linux/compat-2.6.h \ $(BACKPORT_INCLUDES) \ $(KERNEL_MEMTRACK_CFLAGS) \ - $(KERNEL_NFS_FS_CFLAGS) \ $(OPENIB_KERNEL_EXTRA_CFLAGS) \ -I$(CWD)/include \ -I$(CWD)/include/uapi \ -- 2.41.0