Hi all,
After merging the nfsd tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
net/sunrpc/xprtrdma/svc_rdma_backchannel.c: In function 'svc_rdma_handle_bc_reply':
net/sunrpc/xprtrdma/svc_rdma_backchannel.c:67:21: error: 'struct rpc_xprt' has no member named 'recv_lock'; did you mean 'reserve_lock'?
spin_unlock(&xprt->recv_lock);
^~~~~~~~~
reserve_lock
net/sunrpc/xprtrdma/svc_rdma_backchannel.c:79:19: error: 'struct rpc_xprt' has no member named 'recv_lock'; did you mean 'reserve_lock'?
spin_lock(&xprt->recv_lock);
^~~~~~~~~
reserve_lock
Caused by commit
cf4f6fd48dac ("svcrdma: Remove ->release_rqst call in bc reply handler")
interacting with commit
75c84151a9dc ("SUNRPC: Rename xprt->recv_lock to xprt->queue_lock")
from the nfs tree.
I have added the following merge fix patch for today:
From b249a74ca8c4f992e2530f95218ea4f2ed72e0b9 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 5 Oct 2018 09:51:30 +1000
Subject: [PATCH] svcrdma: fix up for recv_lock rename
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c b/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
index 19e34a6aa583..2d176a48543a 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
@@ -64,7 +64,7 @@ int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, __be32 *rdma_resp,
goto out_unlock;
memcpy(dst->iov_base, p, len);
xprt_pin_rqst(req);
- spin_unlock(&xprt->recv_lock);
+ spin_unlock(&xprt->queue_lock);
credits = be32_to_cpup(rdma_resp + 2);
if (credits == 0)
@@ -76,7 +76,7 @@ int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, __be32 *rdma_resp,
xprt->cwnd = credits << RPC_CWNDSHIFT;
spin_unlock_bh(&xprt->transport_lock);
- spin_lock(&xprt->recv_lock);
+ spin_lock(&xprt->queue_lock);
ret = 0;
xprt_complete_rqst(req->rq_task, rcvbuf->len);
xprt_unpin_rqst(req);
--
2.18.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpP8XCFxqkaX.pgp
Description: OpenPGP digital signature
