xprtrdma: add separate Kconfig options for NFSoRDMA client and server support

There are two entirely separate modules under xprtrdma/ and there's no
reason that enabling one should automatically enable the other. Add
config options for each one so they can be enabled/disabled separately.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 241b54f30204a63ec4a63372910a8c1fe714dbad..0754d0f466d2966eb5f5ef416e4b6e1661d0b1cc 100644 (file)
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -9,19 +9,6 @@ config SUNRPC_BACKCHANNEL
        bool
        depends on SUNRPC
 
-config SUNRPC_XPRT_RDMA
-       tristate
-       depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
-       default SUNRPC && INFINIBAND
-       help
-         This option allows the NFS client and server to support
-         an RDMA-enabled transport.
-
-         To compile RPC client RDMA transport support as a module,
-         choose M here: the module will be called xprtrdma.
-
-         If unsure, say N.
-
 config SUNRPC_SWAP
        bool
        depends on SUNRPC
@@ -57,3 +44,29 @@ config SUNRPC_DEBUG
          but makes troubleshooting NFS issues significantly harder.
 
          If unsure, say Y.
+
+config SUNRPC_XPRT_RDMA_CLIENT
+       tristate "RPC over RDMA Client Support"
+       depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
+       default SUNRPC && INFINIBAND
+       help
+         This option allows the NFS client to support an RDMA-enabled
+         transport.
+
+         To compile RPC client RDMA transport support as a module,
+         choose M here: the module will be called xprtrdma.
+
+         If unsure, say N.
+
+config SUNRPC_XPRT_RDMA_SERVER
+       tristate "RPC over RDMA Server Support"
+       depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
+       default SUNRPC && INFINIBAND
+       help
+         This option allows the NFS server to support an RDMA-enabled
+         transport.
+
+         To compile RPC server RDMA transport support as a module,
+         choose M here: the module will be called svcrdma.
+
+         If unsure, say N.

diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile
index 8209a0411bca18ca92f5d13175bc04ffa09d1812..e5a7a1cac8f3f22b53278cf1b8104770c5aef969 100644 (file)
--- a/net/sunrpc/Makefile
+++ b/net/sunrpc/Makefile
@@ -5,7 +5,8 @@
 
 obj-$(CONFIG_SUNRPC) += sunrpc.o
 obj-$(CONFIG_SUNRPC_GSS) += auth_gss/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma/
+
+obj-y += xprtrdma/
 
 sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \
            auth.o auth_null.o auth_unix.o auth_generic.o \

diff --git a/net/sunrpc/xprtrdma/Makefile b/net/sunrpc/xprtrdma/Makefile
index 5a8f268bdd30c5dedfcb73dc6b071c1263553875..da5136fd56943fa91e20946d2a89346c3da556b2 100644 (file)
--- a/net/sunrpc/xprtrdma/Makefile
+++ b/net/sunrpc/xprtrdma/Makefile
@@ -1,8 +1,8 @@
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma.o
+obj-$(CONFIG_SUNRPC_XPRT_RDMA_CLIENT) += xprtrdma.o
 
 xprtrdma-y := transport.o rpc_rdma.o verbs.o
 
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += svcrdma.o
+obj-$(CONFIG_SUNRPC_XPRT_RDMA_SERVER) += svcrdma.o
 
 svcrdma-y := svc_rdma.o svc_rdma_transport.o \
        svc_rdma_marshal.o svc_rdma_sendto.o svc_rdma_recvfrom.o