OSDN Git Service

IB/ipoib: Fix RCU annotations in ipoib_neigh_hash_init()
authorBart Van Assche <bart.vanassche@sandisk.com>
Tue, 26 May 2015 13:03:48 +0000 (15:03 +0200)
committerDoug Ledford <dledford@redhat.com>
Tue, 2 Jun 2015 13:22:31 +0000 (09:22 -0400)
Avoid that sparse complains about ipoib_neigh_hash_init(). This
patch does not change any functionality. See also patch "IPoIB:
Fix memory leak in the neigh table deletion flow" (commit ID
66172c09938b).

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Shlomo Pongratz <shlomop@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/ipoib/ipoib_main.c

index 9e1b203..fec8207 100644 (file)
@@ -1128,7 +1128,7 @@ static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv)
 {
        struct ipoib_neigh_table *ntbl = &priv->ntbl;
        struct ipoib_neigh_hash *htbl;
-       struct ipoib_neigh **buckets;
+       struct ipoib_neigh __rcu **buckets;
        u32 size;
 
        clear_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags);
@@ -1146,7 +1146,7 @@ static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv)
        htbl->size = size;
        htbl->mask = (size - 1);
        htbl->buckets = buckets;
-       ntbl->htbl = htbl;
+       RCU_INIT_POINTER(ntbl->htbl, htbl);
        htbl->ntbl = ntbl;
        atomic_set(&ntbl->entries, 0);