summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/nlm4.c
diff options
context:
space:
mode:
authorKrishna Srinivas <ksriniva@redhat.com>2012-05-18 17:43:49 +0530
committerAnand Avati <avati@redhat.com>2012-05-21 17:29:24 -0700
commit04f6cd78fab5a2fa8a02da3be27b080a15aec203 (patch)
tree07c748be95b274c98f1b02dce02f2f756c25facf /xlators/nfs/server/src/nlm4.c
parentf42dd77fb8cdf5ef439db2c0e8eb6468419998b7 (diff)
nfs/nlm: nlm-unlock call should reply success in case it is not able to find the lock in the list.
Change-Id: I84b298702c445320082ef03de90c924931f1a1e1 BUG: 822384 Signed-off-by: Krishna Srinivas <ksriniva@redhat.com> Reviewed-on: http://review.gluster.com/3368 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/nfs/server/src/nlm4.c')
-rw-r--r--xlators/nfs/server/src/nlm4.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 72f7160..7eb95a7 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1700,19 +1700,22 @@ nlm4_unlock_resume (void *carg)
nlmclnt = nlm_get_uniq (cs->args.nlm4_unlockargs.alock.caller_name);
if (nlmclnt == NULL) {
- gf_log (GF_NLM, GF_LOG_ERROR, "nlm_get_uniq() returned NULL");
+ stat = nlm4_granted;
+ gf_log (GF_NLM, GF_LOG_WARNING, "nlm_get_uniq() returned NULL");
goto nlm4err;
}
cs->fd = fd_lookup_uint64 (cs->resolvedloc.inode, (uint64_t)nlmclnt);
if (cs->fd == NULL) {
- gf_log (GF_NLM, GF_LOG_ERROR, "fd_lookup_uint64() returned NULL");
+ stat = nlm4_granted;
+ gf_log (GF_NLM, GF_LOG_WARNING, "fd_lookup_uint64() returned "
+ "NULL");
goto nlm4err;
}
ret = nlm4_unlock_fd_resume (cs);
nlm4err:
if (ret < 0) {
- gf_log (GF_NLM, GF_LOG_ERROR, "unable to unlock_fd_resume");
+ gf_log (GF_NLM, GF_LOG_WARNING, "unable to unlock_fd_resume");
nlm4_generic_reply (cs->req, cs->args.nlm4_unlockargs.cookie,
stat);