diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-16 08:37:26 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-26 15:31:29 -0400 |
| commit | d5711920ec6e578f51db95caa6f185f5090b865e (patch) | |
| tree | a8c5664d0bdf5d8563eeebb38868b24b75b31d0a /net/sunrpc | |
| parent | 80f455da6cd0998a5be30a8af24ea2a22815c212 (diff) | |
| download | linux-d5711920ec6e578f51db95caa6f185f5090b865e.tar.gz linux-d5711920ec6e578f51db95caa6f185f5090b865e.tar.bz2 linux-d5711920ec6e578f51db95caa6f185f5090b865e.zip | |
Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated"
This reverts commit a79f194aa4879e9baad118c3f8bb2ca24dbef765.
The mechanism for aborting I/O is racy, since we are not guaranteed that
the request is asleep while we're changing both task->tk_status and
task->tk_action.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v5.1
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprt.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 783748dc5e6f..2e71f5455c6c 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1408,13 +1408,6 @@ xprt_request_transmit(struct rpc_rqst *req, struct rpc_task *snd_task) status = -EBADMSG; goto out_dequeue; } - if (task->tk_ops->rpc_call_prepare_transmit) { - task->tk_ops->rpc_call_prepare_transmit(task, - task->tk_calldata); - status = task->tk_status; - if (status < 0) - goto out_dequeue; - } if (RPC_SIGNALLED(task)) { status = -ERESTARTSYS; goto out_dequeue; |