lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] RxRPC: Use new core assertion macros
    Date
    Make RxRPC use the new core assertion macros in place of its own.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    net/rxrpc/ar-internal.h | 71 +----------------------------------------------
    1 files changed, 2 insertions(+), 69 deletions(-)

    diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
    index 8e22bd3..b86fe78 100644
    --- a/net/rxrpc/ar-internal.h
    +++ b/net/rxrpc/ar-internal.h
    @@ -10,6 +10,8 @@
    */

    #include <rxrpc/packet.h>
    +#define ENABLE_ASSERTIONS
    +#include <linux/assert.h>

    #if 0
    #define CHECK_SLAB_OKAY(X) \
    @@ -657,75 +659,6 @@ do { \
    #endif

    /*
    - * debug assertion checking
    - */
    -#if 1 // defined(__KDEBUGALL)
    -
    -#define ASSERT(X) \
    -do { \
    - if (unlikely(!(X))) { \
    - printk(KERN_ERR "\n"); \
    - printk(KERN_ERR "RxRPC: Assertion failed\n"); \
    - BUG(); \
    - } \
    -} while(0)
    -
    -#define ASSERTCMP(X, OP, Y) \
    -do { \
    - if (unlikely(!((X) OP (Y)))) { \
    - printk(KERN_ERR "\n"); \
    - printk(KERN_ERR "RxRPC: Assertion failed\n"); \
    - printk(KERN_ERR "%lu " #OP " %lu is false\n", \
    - (unsigned long)(X), (unsigned long)(Y)); \
    - printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \
    - (unsigned long)(X), (unsigned long)(Y)); \
    - BUG(); \
    - } \
    -} while(0)
    -
    -#define ASSERTIF(C, X) \
    -do { \
    - if (unlikely((C) && !(X))) { \
    - printk(KERN_ERR "\n"); \
    - printk(KERN_ERR "RxRPC: Assertion failed\n"); \
    - BUG(); \
    - } \
    -} while(0)
    -
    -#define ASSERTIFCMP(C, X, OP, Y) \
    -do { \
    - if (unlikely((C) && !((X) OP (Y)))) { \
    - printk(KERN_ERR "\n"); \
    - printk(KERN_ERR "RxRPC: Assertion failed\n"); \
    - printk(KERN_ERR "%lu " #OP " %lu is false\n", \
    - (unsigned long)(X), (unsigned long)(Y)); \
    - printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \
    - (unsigned long)(X), (unsigned long)(Y)); \
    - BUG(); \
    - } \
    -} while(0)
    -
    -#else
    -
    -#define ASSERT(X) \
    -do { \
    -} while(0)
    -
    -#define ASSERTCMP(X, OP, Y) \
    -do { \
    -} while(0)
    -
    -#define ASSERTIF(C, X) \
    -do { \
    -} while(0)
    -
    -#define ASSERTIFCMP(C, X, OP, Y) \
    -do { \
    -} while(0)
    -
    -#endif /* __KDEBUGALL */
    -
    -/*
    * socket buffer accounting / leak finding
    */
    static inline void __rxrpc_new_skb(struct sk_buff *skb, const char *fn)


    \
     
     \ /
      Last update: 2011-10-12 18:51    [W:0.025 / U:119.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site