[patch 59/61] lock validator: special locking: xfrm

[Ingo Molnar]

From: Ingo Molnar <mingo@xxxxxxx>

teach special (non-nested) unlocking code to the lock validator. Has no
effect on non-lockdep kernels.

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
---
 net/xfrm/xfrm_policy.c |    2 +-
 net/xfrm/xfrm_state.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/net/xfrm/xfrm_policy.c
===================================================================
--- linux.orig/net/xfrm/xfrm_policy.c
+++ linux/net/xfrm/xfrm_policy.c
@@ -1308,7 +1308,7 @@ static struct xfrm_policy_afinfo *xfrm_p
 	afinfo = xfrm_policy_afinfo[family];
 	if (likely(afinfo != NULL))
 		read_lock(&afinfo->lock);
-	read_unlock(&xfrm_policy_afinfo_lock);
+	read_unlock_non_nested(&xfrm_policy_afinfo_lock);
 	return afinfo;
 }
 
Index: linux/net/xfrm/xfrm_state.c
===================================================================
--- linux.orig/net/xfrm/xfrm_state.c
+++ linux/net/xfrm/xfrm_state.c
@@ -1105,7 +1105,7 @@ static struct xfrm_state_afinfo *xfrm_st
 	afinfo = xfrm_state_afinfo[family];
 	if (likely(afinfo != NULL))
 		read_lock(&afinfo->lock);
-	read_unlock(&xfrm_state_afinfo_lock);
+	read_unlock_non_nested(&xfrm_state_afinfo_lock);
 	return afinfo;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/