From f9006918cdc52828c9f5effbb386c2a26158f5a7 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 20 Mar 2006 13:44:40 -0500 Subject: [PATCH] --- yaml --- r: 23924 b: refs/heads/master c: 04266473ecf5cdca242201d9f1ed890afe070fb6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/lockd/host.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c8fbf34a398..c0b3f5337521 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 686517f1ad1630c11964d668b556aab79b8c942e +refs/heads/master: 04266473ecf5cdca242201d9f1ed890afe070fb6 diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c index 82f7a0b1d8ae..100e78229700 100644 --- a/trunk/fs/lockd/host.c +++ b/trunk/fs/lockd/host.c @@ -191,11 +191,12 @@ nlm_bind_host(struct nlm_host *host) xprt->resvport = 1; /* NLM requires a reserved port */ /* Existing NLM servers accept AUTH_UNIX only */ - clnt = rpc_create_client(xprt, host->h_name, &nlm_program, + clnt = rpc_new_client(xprt, host->h_name, &nlm_program, host->h_version, RPC_AUTH_UNIX); if (IS_ERR(clnt)) goto forgetit; clnt->cl_autobind = 1; /* turn on pmap queries */ + clnt->cl_softrtry = 1; /* All queries are soft */ host->h_rpcclnt = clnt; }