aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/vis.c
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-11-10 11:00:32 +0100
committerAntonio Quartulli <ordex@autistici.org>2013-01-12 20:58:21 +1000
commitdec05074b1a322f5fbbe3f81bc438a75bfec3c34 (patch)
tree407f9281efb3f42c83773b07c4aae48cb5041937 /net/batman-adv/vis.c
parentbatman-adv: remove useless assignment in tt_local_add() (diff)
downloadlinux-dev-dec05074b1a322f5fbbe3f81bc438a75bfec3c34.tar.xz
linux-dev-dec05074b1a322f5fbbe3f81bc438a75bfec3c34.zip
batman-adv: Initialize lockdep class keys for hashes
Different hashes have the same class key because they get initialised with the same one. For this reason lockdep can create false warning when they are used recursively. Re-initialise the key for each hash after the invocation to hash_new() to avoid this problem. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Tested-by: Linus Lüssing <linus.luessing@web.de> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to '')
-rw-r--r--net/batman-adv/vis.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 0f65a9de5f74..60eb9b7ca8d1 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -28,6 +28,9 @@
#define BATADV_MAX_VIS_PACKET_SIZE 1000
+/* hash class keys */
+static struct lock_class_key batadv_vis_hash_lock_class_key;
+
static void batadv_start_vis_timer(struct batadv_priv *bat_priv);
/* free the info */
@@ -852,6 +855,9 @@ int batadv_vis_init(struct batadv_priv *bat_priv)
goto err;
}
+ batadv_hash_set_lock_class(bat_priv->vis.hash,
+ &batadv_vis_hash_lock_class_key);
+
bat_priv->vis.my_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
if (!bat_priv->vis.my_info)
goto err;