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

diff --git a/rculfhash.c b/rculfhash.c
index 8a9e097..efb1b22 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1097,8 +1097,6 @@ void init_table_populate_partition(struct cds_lfht *ht, unsigned long i,
 			bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
 		(void) _cds_lfht_add(ht, !i ? 0 : (1UL << (i - 1)),
 				new_node, ADD_DEFAULT, 1);
-		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
-			break;
 	}
 	ht->cds_lfht_rcu_read_unlock();
 }
@@ -1200,8 +1198,6 @@ void remove_table_partition(struct cds_lfht *ht, unsigned long i,
 			bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
 		(void) _cds_lfht_del(ht, !i ? 0 : (1UL << (i - 1)),
 				fini_node, 1);
-		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
-			break;
 	}
 	ht->cds_lfht_rcu_read_unlock();
 }
@@ -1651,6 +1647,9 @@ void _do_cds_lfht_resize(struct cds_lfht *ht)
 	 * Resize table, re-do if the target size has changed under us.
 	 */
 	do {
+		assert(uatomic_read(&ht->in_progress_resize));
+		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);