summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/nlm4.c
diff options
context:
space:
mode:
authorkrishna <ksriniva@redhat.com>2012-03-06 15:52:34 +0530
committerVijay Bellur <vijay@gluster.com>2012-03-07 09:18:53 -0800
commit0d99aa113d42d96b35e5bc477349b28ef161c4af (patch)
tree7eb683440cf6e8fc96b1bf67f5e99e8fc309b06b /xlators/nfs/server/src/nlm4.c
parent293aa0b9a08da1c4703ddd992a2e03d53ec84cc5 (diff)
nlm: call nlm4_cancel_fd_resume instead of nlm4_unlock_fd_resume when CANCEL proc is called.
Change-Id: Id4c74165f24cccb46ca5de406dd7e47e4a8b99e1 BUG: 798222 Signed-off-by: krishna <ksriniva@redhat.com> Reviewed-on: http://review.gluster.com/2877 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/nfs/server/src/nlm4.c')
-rw-r--r--xlators/nfs/server/src/nlm4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 3a13cb1..bc55cff 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1367,7 +1367,7 @@ nlm4_cancel_fd_resume (void *carg)
nlm4_check_fh_resolve_status (cs, stat, nlm4err);
nfs_request_user_init (&nfu, cs->req);
nlm4_lock_to_gf_flock (&flock, &cs->args.nlm4_cancargs.alock,
- cs->args.nlm4_cancargs.exclusive);
+ cs->args.nlm4_cancargs.exclusive);
nlm_copy_lkowner (&nfu.lk_owner, &cs->args.nlm4_cancargs.alock.oh);
flock.l_type = F_UNLCK;
ret = nfs_lk (cs->nfsx, cs->vol, &nfu, cs->fd, F_SETLK,
@@ -1467,7 +1467,7 @@ nlm4_cancel_resume (void *carg)
gf_log (GF_NLM, GF_LOG_ERROR, "nlm_get_uniq() returned NULL");
goto nlm4err;
}
- ret = nlm4_unlock_fd_resume (cs);
+ ret = nlm4_cancel_fd_resume (cs);
nlm4err:
if (ret < 0) {