From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses•org>,
Trond Myklebust <trondmy@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Chuck Lever <chuck.lever@oracle•com>
Subject: linux-next: build failure after merge of the nfsd tree
Date: Fri, 5 Oct 2018 09:54:37 +1000 [thread overview]
Message-ID: <20181005095420.184c2619@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2252 bytes --]
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@canb•auug.org.au>
Date: Fri, 5 Oct 2018 09:51:30 +1000
Subject: [PATCH] svcrdma: fix up for recv_lock rename
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-10-04 23:54 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 23:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-06-03 8:24 linux-next: build failure after merge of the nfsd tree Mark Brown
2026-06-03 12:55 ` tanze
2026-05-25 12:57 Mark Brown
2026-05-25 13:08 ` Mark Brown
2026-05-28 8:30 ` Christian Brauner
2026-05-28 8:36 ` Miklos Szeredi
2026-06-01 12:53 ` Mark Brown
2026-06-01 13:00 ` Miklos Szeredi
2020-05-08 0:47 Stephen Rothwell
2020-05-12 0:22 ` J. Bruce Fields
2018-10-05 0:01 Stephen Rothwell
2017-08-25 0:24 Stephen Rothwell
2017-08-30 23:48 ` Stephen Rothwell
2017-08-31 15:55 ` J. Bruce Fields
2015-07-20 23:57 Stephen Rothwell
2015-07-21 5:10 ` Kinglong Mee
2014-08-19 16:38 Stephen Rothwell
2014-05-28 2:07 Stephen Rothwell
2014-05-28 18:57 ` J. Bruce Fields
2014-05-26 1:18 Stephen Rothwell
2014-05-27 21:22 ` J. Bruce Fields
2013-04-29 1:24 Stephen Rothwell
2013-04-29 14:53 ` Chuck Lever
2013-04-29 15:45 ` J. Bruce Fields
2013-04-29 16:05 ` Chuck Lever
2013-04-29 16:21 ` Trond Myklebust
2013-04-29 17:04 ` Chuck Lever
2013-04-29 17:37 ` Simo Sorce
2013-04-29 17:38 ` J. Bruce Fields
2013-04-29 17:47 ` Chuck Lever
2013-04-29 17:57 ` Simo Sorce
2013-04-29 17:59 ` J. Bruce Fields
2013-04-29 18:30 ` Chuck Lever
2013-04-29 18:57 ` J. Bruce Fields
2013-04-29 19:14 ` Chuck Lever
2013-04-29 16:29 ` Simo Sorce
2013-04-29 16:37 ` Chuck Lever
2013-04-29 16:46 ` Simo Sorce
2013-03-01 1:04 Stephen Rothwell
2013-03-01 1:19 ` Myklebust, Trond
2013-03-02 3:42 ` J. Bruce Fields
2013-02-02 2:04 Stephen Rothwell
2013-02-02 12:57 ` J. Bruce Fields
2013-02-03 14:41 ` J. Bruce Fields
2013-02-08 5:41 ` Stanislav Kinsbursky
2013-02-08 21:19 ` J. Bruce Fields
2011-11-15 23:29 Stephen Rothwell
2011-11-16 0:14 ` J. Bruce Fields
2011-11-16 1:26 ` J. Bruce Fields
2010-09-23 1:34 Stephen Rothwell
2010-09-23 2:33 ` J. Bruce Fields
2010-09-23 2:51 ` Neil Brown
2010-09-23 4:03 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181005095420.184c2619@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@fieldses$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=trondmy@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox