lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 111/126] lockdep: Silence warning if CONFIG_LOCKDEP isn't set
    3.2.85-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Bolle <pebolle@tiscali.nl>

    commit 5cd3f5affad2109fd1458aab3f6216f2181e26ea upstream.

    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>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    include/linux/lockdep.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/include/linux/lockdep.h
    +++ b/include/linux/lockdep.h
    @@ -394,7 +394,7 @@ struct lock_class_key { };

    #define lockdep_depth(tsk) (0)

    -#define lockdep_assert_held(l) do { } while (0)
    +#define lockdep_assert_held(l) do { (void)(l); } while (0)
    #define lockdep_assert_held_once(l) do { (void)(l); } while (0)

    #endif /* !LOCKDEP */
    \
     
     \ /
      Last update: 2017-02-16 00:36    [W:4.109 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site