Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

* 'for-linus' of git://linux-nfs.org/~bfields/linux:
  SUNPRC: Fix printk format warning
  nfsd: clean up svc_reserve_auth()
  NLM: don't requeue block if it was invalidated while GRANT_MSG was in flight
  NLM: don't reattempt GRANT_MSG when there is already an RPC in flight
  NLM: have server-side RPC clients default to soft RPC tasks
  NLM: set RPC_CLNT_CREATE_NOPING for NLM RPC clients

1 files changed, 9 insertions, 1 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index ca6b16fc3101..f1ef49fff118 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -243,10 +243,18 @@ nlm_bind_host(struct nlm_host *host)
                         .program        = &nlm_program,
                         .version        = host->h_version,
                         .authflavor     = RPC_AUTH_UNIX,
-                        .flags          = (RPC_CLNT_CREATE_HARDRTRY |
+                        .flags          = (RPC_CLNT_CREATE_NOPING |
                                            RPC_CLNT_CREATE_AUTOBIND),
                 };
 
+                /*
+                 * lockd retries server side blocks automatically so we want
+                 * those to be soft RPC calls. Client side calls need to be
+                 * hard RPC tasks.
+                 */
+                if (!host->h_server)
+                        args.flags |= RPC_CLNT_CREATE_HARDRTRY;
+
                 clnt = rpc_create(&args);
                 if (!IS_ERR(clnt))
                         host->h_rpcclnt = clnt;