RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Correct value printed by assertions/BUG_ON/WARN_ON 

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 <rgoldwyn@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Goldwyn Rodrigues 2016-11-29 10:24:52 -06:00 committed by David Sterba
parent 088ed0e557
commit dd2c2a4c67
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kerncompat.h
View File

@ -88,39 +88,36 @@ static inline void print_trace(void)
} }
static inline void assert_trace(const char *assertion, const char *filename, 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; return;
if (assertion) 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); filename, line, func, assertion, val);
else 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); filename, line, func, val);
print_trace(); print_trace();
abort(); abort();
exit(1); exit(1);
} }
#define BUG() assert_trace(NULL, __FILE__, __func__, __LINE__, 0)
#else
#define BUG() assert(0)
#endif #endif
static inline void warning_trace(const char *assertion, const char *filename, 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) int trace)
{ {
if (val) if (!val)
return; return;
if (assertion) if (assertion)
fprintf(stderr, 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); filename, line, func, assertion, val);
else else
fprintf(stderr, fprintf(stderr,
"%s:%d: %s: Warning: assertion failed, value %d.\n", "%s:%d: %s: Warning: assertion failed, value %ld.\n",
filename, line, func, val); filename, line, func, val);
#ifndef BTRFS_DISABLE_BACKTRACE #ifndef BTRFS_DISABLE_BACKTRACE
if (trace) if (trace)
@ -299,17 +296,15 @@ static inline long IS_ERR(const void *ptr)
#define vfree(x) free(x) #define vfree(x) free(x)
#ifndef BTRFS_DISABLE_BACKTRACE #ifndef BTRFS_DISABLE_BACKTRACE
#define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, !(c)) #define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, (long)(c))
#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, !(c), 1) #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 #else
#define BUG_ON(c) assert(!(c)) #define BUG_ON(c) assert(!(c))
#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, !(c), 0) #define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, (long)(c), 0)
#endif #define ASSERT(c) assert(!(c))
#define BUG() assert(0)
#ifndef BTRFS_DISABLE_BACKTRACE
#define ASSERT(c) assert_trace(#c, __FILE__, __func__, __LINE__, (c))
#else
#define ASSERT(c) assert(c)
#endif #endif
#define container_of(ptr, type, member) ({ \ #define container_of(ptr, type, member) ({ \