diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
| commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
| tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /fs/nfsd/nfs4callback.c | |
| parent | bus: ti-sysc: Increase max softreset wait (diff) | |
| parent | ARM: dts: dra7-evm-common: Fix duplicate mailbox nodes (diff) | |
| download | linux-4263eb6880df8383fff0efb872278a99eb6142c8.tar.xz linux-4263eb6880df8383fff0efb872278a99eb6142c8.zip | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index c3b11a715082..5cf91322de0f 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1312,6 +1312,7 @@ nfsd4_run_cb_work(struct work_struct *work) container_of(work, struct nfsd4_callback, cb_work); struct nfs4_client *clp = cb->cb_clp; struct rpc_clnt *clnt; + int flags; if (cb->cb_need_restart) { cb->cb_need_restart = false; @@ -1340,7 +1341,8 @@ nfsd4_run_cb_work(struct work_struct *work) } cb->cb_msg.rpc_cred = clp->cl_cb_cred; - rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | RPC_TASK_SOFTCONN, + flags = clp->cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN; + rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | flags, cb->cb_ops ? &nfsd4_cb_ops : &nfsd4_cb_probe_ops, cb); } |