lockdep: Silence warning if CONFIG_LOCKDEP isn't set
authorPaul Bolle <pebolle@tiscali.nl>
Thu, 24 Jan 2013 20:53:17 +0000 (21:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:42:41 +0000 (08:42 +0100)
commit5cd3f5affad2109fd1458aab3f6216f2181e26ea
tree5cea168ff323ed1c00c0e6db67d3963298a4c029
parentc06b4f1947213cd0902610fafcabac02d49ad728
lockdep: Silence warning if CONFIG_LOCKDEP isn't set

Since commit c9a4962881929df7f1ef6e63e1b9da304faca4dd ("nfsd:
make client_lock per net") compiling nfs4state.o without
CONFIG_LOCKDEP set, triggers this GCC warning:

    fs/nfsd/nfs4state.c: In function ‘free_client’:
    fs/nfsd/nfs4state.c:1051:19: warning: unused variable ‘nn’ [-Wunused-variable]

The cause of that warning is that lockdep_assert_held() compiles
away if CONFIG_LOCKDEP is not set. Silence this warning by using
the argument to lockdep_assert_held() as a nop if CONFIG_LOCKDEP
is not set.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: J. Bruce Fields <bfields@redhat.com>
Link: http://lkml.kernel.org/r/1359060797.1325.33.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar <mingo@kernel.org>
--
 include/linux/lockdep.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/lockdep.h