diff options
author | Benjamin Coddington <bcodding@redhat.com> | 2014-09-23 12:26:20 -0400 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-14 15:20:05 +0000 |
commit | e7b7a6ddf4732f696fe3b412035f25b8bced18d2 (patch) | |
tree | 9b5c29ab304435366850de20d827cba3419dbf3d /fs/lockd | |
parent | ebc39080bfdbc1b1a109b44a45faf3690f240690 (diff) | |
download | linux-stable-e7b7a6ddf4732f696fe3b412035f25b8bced18d2.tar.gz linux-stable-e7b7a6ddf4732f696fe3b412035f25b8bced18d2.tar.bz2 linux-stable-e7b7a6ddf4732f696fe3b412035f25b8bced18d2.zip |
lockd: Try to reconnect if statd has moved
commit 173b3afceebe76fa2205b2c8808682d5b541fe3c upstream.
If rpc.statd is restarted, upcalls to monitor hosts can fail with
ECONNREFUSED. In that case force a lookup of statd's new port and retry the
upcall.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/mon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 1812f026960c..6ae664b489af 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -159,6 +159,12 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res, msg.rpc_proc = &clnt->cl_procinfo[proc]; status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFTCONN); + if (status == -ECONNREFUSED) { + dprintk("lockd: NSM upcall RPC failed, status=%d, forcing rebind\n", + status); + rpc_force_rebind(clnt); + status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFTCONN); + } if (status < 0) dprintk("lockd: NSM upcall RPC failed, status=%d\n", status); |