]> www.infradead.org Git - users/jedix/linux-maple.git/commit
rpcrdma: Merge svcrdma and xprtrdma modules into one
authorChuck Lever <chuck.lever@oracle.com>
Mon, 31 Aug 2015 20:40:48 +0000 (14:40 -0600)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 31 Aug 2015 20:40:48 +0000 (14:40 -0600)
commit29e90b76f6d08f139d67a984917b81e391a93b50
treec7f81c381cf39598ca5d5efc395228cc694b5a2f
parentc668b4750d416cfd088b53490d54717fa7027be2
rpcrdma: Merge svcrdma and xprtrdma modules into one

[ Upstream commit ffe1f0df586237a18f9b568597bddabb56e96d5e ]

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>
net/sunrpc/Kconfig
net/sunrpc/Makefile
net/sunrpc/xprtrdma/Makefile
net/sunrpc/xprtrdma/module.c [new file with mode: 0644]
net/sunrpc/xprtrdma/svc_rdma.c
net/sunrpc/xprtrdma/transport.c
net/sunrpc/xprtrdma/xprt_rdma.h