5 files changed, 11 insertions, 5 deletions
diff --git a/xlators/features/locks/src/clear.c b/xlators/features/locks/src/clear.c
index d7c210f24a5..22c03b5b7bf 100644
--- a/xlators/features/locks/src/clear.c
+++ b/xlators/features/locks/src/clear.c
@@ -184,7 +184,7 @@ clrlk_clear_posixlk (xlator_t *this, pl_inode_t *pl_inode, clrlk_args *args,
                         } else {
                                 gcount++;
                         }
-                        GF_FREE (plock);
+                        __destroy_lock(plock);
                 }
         }
         pthread_mutex_unlock (&pl_inode->mutex);
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index bd479ea439a..fa4dee487d1 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -438,6 +438,7 @@ pl_inode_get (xlator_t *this, inode_t *inode)
 
                 ret = __inode_ctx_put (inode, this, (uint64_t)(long)(pl_inode));
                 if (ret) {
+                        pthread_mutex_destroy (&pl_inode->mutex);
                         GF_FREE (pl_inode);
                         pl_inode = NULL;
                         goto unlock;
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 4231d760cdc..8e9008b0d9a 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -784,7 +784,7 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this,
                 break;
 
         default:
-                inode_unref (pinode->inode);
+                need_inode_unref = _gf_true;
                 gf_log (this->name, GF_LOG_ERROR,
                         "Unexpected case in entrylk (cmd=%d). Please file"
                         "a bug report at http://bugs.gluster.com", cmd);
@@ -960,6 +960,7 @@ pl_entrylk_client_cleanup (xlator_t *this, pl_ctx_t *ctx)
 			__pl_entrylk_unref (l);
 		}
 		pthread_mutex_unlock (&pinode->mutex);
+
                 inode_unref (pinode->inode);
         }
 
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index e1702c78ba1..4aebac64fae 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -721,9 +721,6 @@ out:
 	if (ctx)
 		pthread_mutex_unlock (&ctx->lock);
 
-        if (need_inode_unref)
-                inode_unref (pl_inode->inode);
-
         /* The following (extra) unref corresponds to the ref that
          * was done at the time the lock was granted.
          */
@@ -732,6 +729,10 @@ out:
                 grant_blocked_inode_locks (this, pl_inode, dom);
         }
 
+        if (need_inode_unref) {
+                inode_unref (pl_inode->inode);
+        }
+
         return ret;
 }
 
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 931b9aeb6c5..a2e47fc8ef4 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -2475,6 +2475,7 @@ pl_forget (xlator_t *this,
                                                   list) {
 
                                 list_del (&rw_req->list);
+                                call_stub_destroy(rw_req->stub);
                                 GF_FREE (rw_req);
                         }
                 }
@@ -2558,6 +2559,8 @@ pl_forget (xlator_t *this,
 
         }
 
+        pthread_mutex_destroy(&pl_inode->mutex);
+
         GF_FREE (pl_inode);
 
         return 0;