diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:32:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:32:15 -0700 |
| commit | 9092131f7ea2f9e92a510ae13ac4d20165aa921c (patch) | |
| tree | 4bcac80a227d320b69454057cdcef41ef43c6c85 /fs/lockd/mon.c | |
| parent | f1b04770b0d073a9d70e5b3b873d274c1c19e1f6 (diff) | |
| parent | eadf4598e7ec37a234e70e965bd335860e58bda4 (diff) | |
Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/lockd/mon.c')
| -rw-r--r-- | fs/lockd/mon.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 6fc1bebeec1d..2d144abe84ad 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -115,20 +115,19 @@ nsm_create(void) xprt = xprt_create_proto(IPPROTO_UDP, &sin, NULL); if (IS_ERR(xprt)) return (struct rpc_clnt *)xprt; + xprt->resvport = 1; /* NSM requires a reserved port */ clnt = rpc_create_client(xprt, "localhost", &nsm_program, SM_VERSION, RPC_AUTH_NULL); if (IS_ERR(clnt)) - goto out_destroy; + goto out_err; clnt->cl_softrtry = 1; clnt->cl_chatty = 1; clnt->cl_oneshot = 1; - xprt->resvport = 1; /* NSM requires a reserved port */ return clnt; -out_destroy: - xprt_destroy(xprt); +out_err: return clnt; } |