lkml.org 
[lkml]   [2013]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] lockdep: make lockdep_assert_held() not have a return value
Date
From: Johannes Berg <johannes.berg@intel.com>

I recently made the mistake of writing:

foo = lockdep_dereference_protected(..., lockdep_assert_held(...));

which is clearly bogus. If lockdep is disabled in the
config this would cause a compile failure, if it is
enabled then it compiles and causes a puzzling warning
about dereferencing without the correct protection.

Wrap the macro in "do { ... } while (0)" to also fail
compile for this when lockdep is enabled.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
include/linux/lockdep.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 00e4637..6d2fba2 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -359,7 +359,9 @@ extern void lockdep_trace_alloc(gfp_t mask);

#define lockdep_depth(tsk) (debug_locks ? (tsk)->lockdep_depth : 0)

-#define lockdep_assert_held(l) WARN_ON(debug_locks && !lockdep_is_held(l))
+#define lockdep_assert_held(l) do { \
+ WARN_ON(debug_locks && !lockdep_is_held(l)); \
+ } while (0)

#define lockdep_recursing(tsk) ((tsk)->lockdep_recursion)

--
1.8.0


\
 
 \ /
  Last update: 2013-01-19 00:02    [W:0.030 / U:0.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site