performance/io-cache: fix deadlock in ioc_fault_cbkv3.1.6qa4

Change-Id: I899abecd17025c299819b36c2d39adc52adb1bd6
BUG: 3340
Reviewed-on: http://review.gluster.com/177
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>

1 files changed, 2 insertions, 21 deletions

diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c
index 728f0373635..a8d98a4d8de 100644
--- a/xlators/performance/io-cache/src/page.c
+++ b/xlators/performance/io-cache/src/page.c
@@ -78,7 +78,7 @@ out:
 }
 
 /*
- * ioc_page_destroy -
+ * __ioc_page_destroy -
  *
  * @page:
  *
@@ -121,25 +121,6 @@ __ioc_page_destroy (ioc_page_t *page)
 }
 
 
-int64_t
-ioc_page_destroy (ioc_page_t *page)
-{
-        int64_t ret = 0;
-
-        if (page == NULL) {
-                goto out;
-        }
-
-        ioc_inode_lock (page->inode);
-        {
-                ret = __ioc_page_destroy (page);
-        }
-        ioc_inode_unlock (page->inode);
-
-out:
-        return ret;
-}
-
 int32_t
 __ioc_inode_prune (ioc_inode_t *curr, uint64_t *size_pruned,
                    uint64_t size_to_prune, uint32_t index)
@@ -920,7 +901,7 @@ __ioc_page_error (ioc_page_t *page, int32_t op_ret, int32_t op_errno)
         }
 
         table = page->inode->table;
-        ret = ioc_page_destroy (page);
+        ret = __ioc_page_destroy (page);
 
         if (ret != -1) {
                 table->cache_used -= ret;