[B.A.T.M.A.N.] [PATCH] batman-adv: Fix lockdep annotation of batadv_tlv_container_remove

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix lockdep annotation of batadv_tlv_container_remove

[Sven Eckelmann]

The function handles tlv containers and not tlv handlers. Thus the
lockdep_assert_held has to check for the container_list lock.

Fixes: 5b95c427d187 ("batman-adv: Annotate deleting functions with external lock via lockdep")
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
 net/batman-adv/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 2fa168a..c898853 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -747,7 +747,7 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)
 static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv,
 					 struct batadv_tvlv_container *tvlv)
 {
-	lockdep_assert_held(&bat_priv->tvlv.handler_list_lock);
+	lockdep_assert_held(&bat_priv->tvlv.container_list_lock);
 
 	if (!tvlv)
 		return;
-- 
2.6.2

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Fix lockdep annotation of batadv_tlv_container_remove

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

On Tuesday, November 03, 2015 17:43:05 Sven Eckelmann wrote:
> The function handles tlv containers and not tlv handlers. Thus the
> lockdep_assert_held has to check for the container_list lock.
> 
> Fixes: 5b95c427d187 ("batman-adv: Annotate deleting functions with external
> lock via lockdep") Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
> ---
>  net/batman-adv/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision 41a559a.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]