From patchwork Tue Nov 29 16:24:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goldwyn Rodrigues X-Patchwork-Id: 9452661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A2F6B6071C for ; Tue, 29 Nov 2016 16:25:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95AF828404 for ; Tue, 29 Nov 2016 16:25:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A54728407; Tue, 29 Nov 2016 16:25:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2912928404 for ; Tue, 29 Nov 2016 16:25:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbcK2QZI (ORCPT ); Tue, 29 Nov 2016 11:25:08 -0500 Received: from mx2.suse.de ([195.135.220.15]:51872 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbcK2QZH (ORCPT ); Tue, 29 Nov 2016 11:25:07 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id CBD5DABE7 for ; Tue, 29 Nov 2016 16:25:05 +0000 (UTC) From: Goldwyn Rodrigues To: linux-btrfs@vger.kernel.org Cc: Goldwyn Rodrigues Subject: [PATCH 1/2] btrfs-progs: Correct value printed by assertions/BUG_ON/WARN_ON Date: Tue, 29 Nov 2016 10:24:52 -0600 Message-Id: <20161129162452.28402-1-rgoldwyn@suse.de> X-Mailer: git-send-email 2.10.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Goldwyn Rodrigues The values passed to BUG_ON/WARN_ON are negated(!) and printed, which results in printing the value zero for each bug/warning. For example: volumes.c:988: btrfs_alloc_chunk: Assertion `ret` failed, value 0 This is not useful. Instead changed to print the value of the parameter passed to BUG_ON()/WARN_ON(). The value needed to be changed to long to accomodate pointers being passed. Also, consolidated assert() and BUG() into ifndef. Signed-off-by: Goldwyn Rodrigues --- kerncompat.h | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/kerncompat.h b/kerncompat.h index ed9a042..9bd25bd 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -88,39 +88,36 @@ static inline void print_trace(void) } static inline void assert_trace(const char *assertion, const char *filename, - const char *func, unsigned line, int val) + const char *func, unsigned line, long val) { - if (val) + if (!val) return; if (assertion) - fprintf(stderr, "%s:%d: %s: Assertion `%s` failed, value %d\n", + fprintf(stderr, "%s:%d: %s: Assertion `%s` failed, value %ld\n", filename, line, func, assertion, val); else - fprintf(stderr, "%s:%d: %s: Assertion failed, value %d.\n", + fprintf(stderr, "%s:%d: %s: Assertion failed, value %ld.\n", filename, line, func, val); print_trace(); abort(); exit(1); } -#define BUG() assert_trace(NULL, __FILE__, __func__, __LINE__, 0) -#else -#define BUG() assert(0) #endif static inline void warning_trace(const char *assertion, const char *filename, - const char *func, unsigned line, int val, + const char *func, unsigned line, long val, int trace) { - if (val) + if (!val) return; if (assertion) fprintf(stderr, - "%s:%d: %s: Warning: assertion `%s` failed, value %d\n", + "%s:%d: %s: Warning: assertion `%s` failed, value %ld\n", filename, line, func, assertion, val); else fprintf(stderr, - "%s:%d: %s: Warning: assertion failed, value %d.\n", + "%s:%d: %s: Warning: assertion failed, value %ld.\n", filename, line, func, val); #ifndef BTRFS_DISABLE_BACKTRACE if (trace) @@ -299,17 +296,15 @@ static inline long IS_ERR(const void *ptr) #define vfree(x) free(x) #ifndef BTRFS_DISABLE_BACKTRACE -#define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, !(c)) -#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, !(c), 1) +#define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, (long)(c)) +#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, (long)(c), 1) +#define ASSERT(c) assert_trace(#c, __FILE__, __func__, __LINE__, (long)!(c)) +#define BUG() assert_trace(NULL, __FILE__, __func__, __LINE__, 1) #else #define BUG_ON(c) assert(!(c)) -#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, !(c), 0) -#endif - -#ifndef BTRFS_DISABLE_BACKTRACE -#define ASSERT(c) assert_trace(#c, __FILE__, __func__, __LINE__, (c)) -#else -#define ASSERT(c) assert(c) +#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, (long)(c), 0) +#define ASSERT(c) assert(!(c)) +#define BUG() assert(0) #endif #define container_of(ptr, type, member) ({ \