Patch "SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sunrpc-silence-warn_on-when-nfsv4.1-over-rdma-is-in-use.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Chuck Lever <[email protected]>
Date: Mon, 22 Aug 2016 14:57:42 -0400
Subject: SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use

From: Chuck Lever <[email protected]>

commit 16590a228109e2f318d2cc6466221134cfab723a upstream.

Using NFSv4.1 on RDMA should be safe, so broaden the new checks in rpc_create().

WARN_ON_ONCE is used, matching most other WARN call sites in clnt.c.

---
 net/sunrpc/clnt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -453,7 +453,7 @@ static struct rpc_clnt *rpc_create_xprt(
 	struct rpc_xprt_switch *xps;
 
 	if (args->bc_xprt && args->bc_xprt->xpt_bc_xps) {
-		WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+		WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC));
 		xps = args->bc_xprt->xpt_bc_xps;
 		xprt_switch_get(xps);
 	} else {

@@ -520,7 +520,7 @@ struct rpc_clnt *rpc_create(struct rpc_c
 	char servername[48];
 
 	if (args->bc_xprt) {
-		WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+		WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC));
 		xprt = args->bc_xprt->xpt_bc_xprt;
 		if (xprt) {
 			xprt_get(xprt);

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/xprtrdma-remove-fmrs-from-the-unmap-list-after-unmapping.patch queue-4.7/svc-avoid-garbage-replies-when-pc_func-returns-rpc_drop_reply.patch queue-4.7/nfs-don-t-drop-cb-requests-with-invalid-principals.patch queue-4.7/sunrpc-silence-warn_on-when-nfsv4.1-over-rdma-is-in-use.patch