diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2015-06-04 11:21:42 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-06-04 16:56:02 -0400 |
| commit | ffe1f0df586237a18f9b568597bddabb56e96d5e (patch) | |
| tree | c0a56204cdd1f9f9bcde3f0d641bbcaf5414c15f /net/sunrpc/Makefile | |
| parent | 0380a3f37540ad0582b3c749a74fc127af914689 (diff) | |
| download | linux-ffe1f0df586237a18f9b568597bddabb56e96d5e.tar.bz2 | |
rpcrdma: Merge svcrdma and xprtrdma modules into one
Bi-directional RPC support means code in svcrdma.ko invokes a bit of
code in xprtrdma.ko, and vice versa. To avoid loader/linker loops,
merge the server and client side modules together into a single
module.
When backchannel capabilities are added, the combined module will
register all needed transport capabilities so that Upper Layer
consumers automatically have everything needed to create a
bi-directional transport connection.
Module aliases are added for backwards compatibility with user
space, which still may expect svcrdma.ko or xprtrdma.ko to be
present.
This commit reverts commit 2e8c12e1b765 ("xprtrdma: add separate
Kconfig options for NFSoRDMA client and server support") and
provides a single CONFIG option for enabling the new module.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc/Makefile')
| -rw-r--r-- | net/sunrpc/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile index 15e6f6c23c5d..936ad0a15371 100644 --- a/net/sunrpc/Makefile +++ b/net/sunrpc/Makefile @@ -5,8 +5,7 @@ obj-$(CONFIG_SUNRPC) += sunrpc.o obj-$(CONFIG_SUNRPC_GSS) += auth_gss/ - -obj-y += xprtrdma/ +obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma/ sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ auth.o auth_null.o auth_unix.o auth_generic.o \ |