summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2017-01-13 14:02:45 +0100
committerJeff Darcy <jeff@pl.atyp.us>2017-05-10 12:27:12 +0000
commite997d752ba08f80b1b00d2c0035874befafe5200 (patch)
treeb2633b46deac674a0436d4adcf9faf54ae469cb8
parentd8ee72b9227fecf6e8bc89ed25e059acb240fdb8 (diff)
nfs/nlm: ignore notify when there is no matching rpc request
In certain (unclear) occasions it seems to happen that there are notifications sent to the Gluster/NFS NLM service, but no call-state can be found. Instead of segfaulting, log an error but keep on running. Change-Id: I0f186e56e46a86ca40314d230c1cc7719c61f0b5 BUG: 1381970 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://review.gluster.org/17185 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: soumya k <skoduri@redhat.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
-rw-r--r--xlators/nfs/server/src/nlm4.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index de914353e64..dcb1784127e 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -919,10 +919,16 @@ nlm_rpcclnt_notify (struct rpc_clnt *rpc_clnt, void *mydata,
nfs3_call_state_t *cs = NULL;
cs = mydata;
- caller_name = cs->args.nlm4_lockargs.alock.caller_name;
switch (fn) {
case RPC_CLNT_CONNECT:
+ if (!cs->req) {
+ gf_msg (GF_NLM, GF_LOG_ERROR, EINVAL,
+ NFS_MSG_RPC_CLNT_ERROR, "Spurious notify?!");
+ goto err;
+ }
+
+ caller_name = cs->args.nlm4_lockargs.alock.caller_name;
ret = nlm_set_rpc_clnt (rpc_clnt, caller_name);
if (ret == -1) {
gf_msg (GF_NLM, GF_LOG_ERROR, 0,