rhashtable: Fix cmpxchg RCU warnings
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 16 May 2019 07:19:48 +0000 (15:19 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 May 2019 16:45:20 +0000 (09:45 -0700)
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: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
lib/rhashtable.c

index 7708699a5b96d0e09a611d9f2419e97a84a07e64..935ec80f213ff46028d0413a21d4ca69e906ccc0 100644 (file)
@@ -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;