From 03dd62ba55d42dfd6dc0014988c509e43ca8009e Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Fri, 13 Jan 2017 14:46:17 +0100
Subject: [PATCH 441/473] nfs/nlm: log the caller_name if nlm_client_t can be
 found

In order to help tracking possible misbehaving clients down, log the
'caller_name' (hostname of the NFS client) that does not have a matching
nlm_client_t structure.

Cherry picked from commit 9bfb74a39954a7e63bfd762c816efc7e64b9df65:
> Change-Id: Ib514a78d1809719a3d0274acc31ee632727d746d
> BUG: 1381970
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: https://review.gluster.org/17186
> 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: Jeff Darcy <jeff@pl.atyp.us>

Change-Id: Ib514a78d1809719a3d0274acc31ee632727d746d
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/106033
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 xlators/nfs/server/src/nlm4.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 0e4a4d8..903262e 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1736,18 +1736,20 @@ nlm4_unlock_resume (void *carg)
         int                             ret = -1;
         nfs3_call_state_t               *cs = NULL;
         nlm_client_t                    *nlmclnt = NULL;
+        char                            *caller_name = NULL;
 
         if (!carg)
                 return ret;
 
         cs = (nfs3_call_state_t *)carg;
         nlm4_check_fh_resolve_status (cs, stat, nlm4err);
+        caller_name = cs->args.nlm4_unlockargs.alock.caller_name;
 
-        nlmclnt = nlm_get_uniq (cs->args.nlm4_unlockargs.alock.caller_name);
+        nlmclnt = nlm_get_uniq (caller_name);
         if (nlmclnt == NULL) {
                 stat = nlm4_granted;
                 gf_msg (GF_NLM, GF_LOG_WARNING, ENOLCK, NFS_MSG_NO_MEMORY,
-                        "nlm_get_uniq() returned NULL");
+                        "nlm_get_uniq() returned NULL for %s", caller_name);
                 goto nlm4err;
         }
         cs->fd = fd_lookup_uint64 (cs->resolvedloc.inode, (uint64_t)nlmclnt);
-- 
1.8.3.1