Although _cds_lfht_replace() is not a plublic API,
but a proper name will help for reading or maintainance.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
static
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
struct cds_lfht_node *old_node,
static
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
struct cds_lfht_node *old_node,
- struct cds_lfht_node *ret_next,
+ struct cds_lfht_node *old_next,
struct cds_lfht_node *new_node)
{
struct cds_lfht_node *new_node)
{
- struct cds_lfht_node *dummy, *old_next;
+ struct cds_lfht_node *dummy, *ret_next;
struct _cds_lfht_node *lookup;
int flagged = 0;
struct _cds_lfht_node *lookup;
int flagged = 0;
assert(!is_removed(new_node));
assert(!is_dummy(new_node));
assert(new_node != old_node);
assert(!is_removed(new_node));
assert(!is_dummy(new_node));
assert(new_node != old_node);
/* Insert after node to be replaced */
/* Insert after node to be replaced */
if (is_removed(old_next)) {
/*
* Too late, the old node has been removed under us
if (is_removed(old_next)) {
/*
* Too late, the old node has been removed under us
*/
ret_next = uatomic_cmpxchg(&old_node->p.next,
old_next, flag_removed(new_node));
*/
ret_next = uatomic_cmpxchg(&old_node->p.next,
old_next, flag_removed(new_node));
- } while (ret_next != old_next);
+ if (ret_next == old_next)
+ break;
+ old_next = ret_next;
+ }
/* We performed the replacement. */
flagged = 1;
/* We performed the replacement. */
flagged = 1;