diff options
author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-16 08:37:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:23:45 +0200 |
commit | e0e3650991cd69492258e1fcfb9731d86b4e38e9 (patch) | |
tree | 4b08d139e27558f7e275534e128e1640ba73e211 /include | |
parent | 666a848c6797090c8bafdc1a14876b020f4dfac9 (diff) | |
download | linux-stable-e0e3650991cd69492258e1fcfb9731d86b4e38e9.tar.gz linux-stable-e0e3650991cd69492258e1fcfb9731d86b4e38e9.tar.bz2 linux-stable-e0e3650991cd69492258e1fcfb9731d86b4e38e9.zip |
Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated"
commit d5711920ec6e578f51db95caa6f185f5090b865e upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sunrpc/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h index d0e451868f02..c72dfd518782 100644 --- a/include/linux/sunrpc/sched.h +++ b/include/linux/sunrpc/sched.h @@ -98,7 +98,6 @@ typedef void (*rpc_action)(struct rpc_task *); struct rpc_call_ops { void (*rpc_call_prepare)(struct rpc_task *, void *); - void (*rpc_call_prepare_transmit)(struct rpc_task *, void *); void (*rpc_call_done)(struct rpc_task *, void *); void (*rpc_count_stats)(struct rpc_task *, void *); void (*rpc_release)(void *); |