Commit 160881e3 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust

NFS: Enable nfs4_setup_sequence() for DELEGRETURN

When CONFIG_NFS_V4_1 is disabled, the calls to nfs4_setup_sequence()
and nfs4_sequence_done() are compiled out for the DELEGRETURN
operation.  To allow NFSv4.0 transport blocking to work for
DELEGRETURN, these call sites have to be present all the time.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3bd2384a
...@@ -4918,7 +4918,6 @@ static void nfs4_delegreturn_release(void *calldata) ...@@ -4918,7 +4918,6 @@ static void nfs4_delegreturn_release(void *calldata)
kfree(calldata); kfree(calldata);
} }
#if defined(CONFIG_NFS_V4_1)
static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data)
{ {
struct nfs4_delegreturndata *d_data; struct nfs4_delegreturndata *d_data;
...@@ -4930,12 +4929,9 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) ...@@ -4930,12 +4929,9 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data)
&d_data->res.seq_res, &d_data->res.seq_res,
task); task);
} }
#endif /* CONFIG_NFS_V4_1 */
static const struct rpc_call_ops nfs4_delegreturn_ops = { static const struct rpc_call_ops nfs4_delegreturn_ops = {
#if defined(CONFIG_NFS_V4_1)
.rpc_call_prepare = nfs4_delegreturn_prepare, .rpc_call_prepare = nfs4_delegreturn_prepare,
#endif /* CONFIG_NFS_V4_1 */
.rpc_call_done = nfs4_delegreturn_done, .rpc_call_done = nfs4_delegreturn_done,
.rpc_release = nfs4_delegreturn_release, .rpc_release = nfs4_delegreturn_release,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment