Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9458a4e authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

rhashtable: Fix cmpxchg RCU warnings 



As cmpxchg is a non-RCU mechanism it will cause sparse warnings
when we use it for RCU.  This patch adds explicit casts to silence
those warnings.  This should probably be moved to RCU itself in
future.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba6306e3

lib/rhashtable.c

+3 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static union nested_table *nested_table_alloc(struct rhashtable *ht, 
			INIT_RHT_NULLS_HEAD(ntbl[i].bucket);

	}



	if (cmpxchg(prev, NULL, ntbl) == NULL)

	if (cmpxchg((union nested_table **)prev, NULL, ntbl) == NULL)

		return ntbl;

	/* Raced with another thread. */

	kfree(ntbl);
@@ -296,7 +296,8 @@ static int rhashtable_rehash_attach(struct rhashtable *ht, 
	 * rcu_assign_pointer().

	 */



	if (cmpxchg(&old_tbl->future_tbl, NULL, new_tbl) != NULL)

	if (cmpxchg((struct bucket_table **)&old_tbl->future_tbl, NULL,

		    new_tbl) != NULL)

		return -EEXIST;



	return 0;