diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:40:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:40:35 -0400 |
| commit | f5fc33e4e6450785d10448d1a6bd970ca18f4ca4 (patch) | |
| tree | 090fddf280ef2895ff5bc9ddea925b750b19aab0 | |
| parent | 2cd41401bd2abee638fffeac6a93d6930e8a208e (diff) | |
| download | longterm-queue-4.12-f5fc33e4e6450785d10448d1a6bd970ca18f4ca4.tar.gz | |
sunrpc: refresh for older "unlikely" prefix
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch b/queue/xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch index 65d740a..6d5ae8f 100644 --- a/queue/xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch +++ b/queue/xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch @@ -1,4 +1,4 @@ -From 8f66b1a529047a972cb9602a919c53a95f3d7a2b Mon Sep 17 00:00:00 2001 +From 951450729009a1a7de11051acd6e4cf66206378c Mon Sep 17 00:00:00 2001 From: Chuck Lever <chuck.lever@oracle.com> Date: Mon, 9 Oct 2017 12:03:26 -0400 Subject: [PATCH] xprtrdma: Don't defer fencing an async RPC's chunks @@ -25,15 +25,16 @@ by frwr_op_map. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c -index c84e2b644e13..8cf5ccfe180d 100644 +index 62ecbccd9748..573aab1895f3 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c -@@ -686,7 +686,7 @@ xprt_rdma_free(struct rpc_task *task) +@@ -685,7 +685,7 @@ xprt_rdma_free(struct rpc_task *task) dprintk("RPC: %s: called on 0x%p\n", __func__, req->rl_reply); - if (!list_empty(&req->rl_registered)) + if (unlikely(!list_empty(&req->rl_registered))) - ia->ri_ops->ro_unmap_safe(r_xprt, req, !RPC_IS_ASYNC(task)); + ia->ri_ops->ro_unmap_sync(r_xprt, &req->rl_registered); rpcrdma_unmap_sges(ia, req); |