X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=8a9e0974926d7ce3973f40b92fb629eebc58e0f2;hb=ed35e6d83818d603682c7adafe7f32f05826e204;hp=070bcaf7c52acf5687ef3f729a62f5e41572d4e1;hpb=24953e081b6cb2e0f4ce1de1c42664ece3c3ce1b;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index 070bcaf..8a9e097 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1651,8 +1651,6 @@ void _do_cds_lfht_resize(struct cds_lfht *ht)
 	 * Resize table, re-do if the target size has changed under us.
 	 */
 	do {
-		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
-			break;
 		ht->t.resize_initiated = 1;
 		old_size = ht->t.size;
 		new_size = CMM_LOAD_SHARED(ht->t.resize_target);
@@ -1721,7 +1719,11 @@ void cds_lfht_resize_lazy(struct cds_lfht *ht, unsigned long size, int growth)
 	cmm_smp_mb();
 	if (!CMM_LOAD_SHARED(ht->t.resize_initiated) && size < target_size) {
 		uatomic_inc(&ht->in_progress_resize);
-		cmm_smp_mb();	/* increment resize count before calling it */
+		cmm_smp_mb();	/* increment resize count before load destroy */
+		if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
+			uatomic_dec(&ht->in_progress_resize);
+			return;
+		}
 		work = malloc(sizeof(*work));
 		work->ht = ht;
 		ht->cds_lfht_call_rcu(&work->head, do_resize_cb);
@@ -1744,7 +1746,11 @@ void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
 	cmm_smp_mb();
 	if (!CMM_LOAD_SHARED(ht->t.resize_initiated)) {
 		uatomic_inc(&ht->in_progress_resize);
-		cmm_smp_mb();	/* increment resize count before calling it */
+		cmm_smp_mb();	/* increment resize count before load destroy */
+		if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
+			uatomic_dec(&ht->in_progress_resize);
+			return;
+		}
 		work = malloc(sizeof(*work));
 		work->ht = ht;
 		ht->cds_lfht_call_rcu(&work->head, do_resize_cb);