|
 |
cb8e9e |
From dad0770acb2b1ccbefd317c03e2b202dfbdd0178 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Susant Palai <spalai@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 16 Sep 2015 07:04:24 -0400
|
|
|
cb8e9e |
Subject: [PATCH 331/331] dht/cluster: Avoid double unlock in dht_refresh_layout_cbk
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: Id230ec744e277cd6a24a09890496a0c3023e565f
|
|
|
cb8e9e |
BUG: 1263653
|
|
|
cb8e9e |
Signed-off-by: Susant Palai <spalai@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/57882
|
|
|
cb8e9e |
Reviewed-by: Nithya Balachandran <nbalacha@redhat.com>
|
|
|
cb8e9e |
Tested-by: Nithya Balachandran <nbalacha@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/cluster/dht/src/dht-selfheal.c | 3 +--
|
|
|
cb8e9e |
1 files changed, 1 insertions(+), 2 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
|
|
|
cb8e9e |
index b9b58ea..b3f1c4d 100644
|
|
|
cb8e9e |
--- a/xlators/cluster/dht/src/dht-selfheal.c
|
|
|
cb8e9e |
+++ b/xlators/cluster/dht/src/dht-selfheal.c
|
|
|
cb8e9e |
@@ -226,7 +226,6 @@ unlock:
|
|
|
cb8e9e |
err:
|
|
|
cb8e9e |
local->refresh_layout_unlock (frame, this, -1);
|
|
|
cb8e9e |
|
|
|
cb8e9e |
- dht_selfheal_dir_finish (frame, this, -1);
|
|
|
cb8e9e |
return 0;
|
|
|
cb8e9e |
}
|
|
|
cb8e9e |
|
|
|
cb8e9e |
@@ -293,7 +292,7 @@ dht_refresh_layout (call_frame_t *frame)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
out:
|
|
|
cb8e9e |
local->refresh_layout_unlock (frame, this, -1);
|
|
|
cb8e9e |
- dht_selfheal_dir_finish (frame, this, -1);
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
return 0;
|
|
|
cb8e9e |
}
|
|
|
cb8e9e |
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|