marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Remove duplicate printfs in warning_trace()/assert_trace() 

Code reduction. Call warning_trace from assert_trace in order to
reduce the printf's used. Also, trace variable in warning_trace()
is not required because it is already handled by BTRFS_DISABLE_BACKTRACE.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Goldwyn Rodrigues 2016-11-29 10:25:14 -06:00 committed by David Sterba
parent dd2c2a4c67
commit 4927705d6f
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
kerncompat.h
View File

@ -86,28 +86,10 @@ static inline void print_trace(void)
size = backtrace(array, MAX_BACKTRACE);
backtrace_symbols_fd(array, size, 2);
}
static inline void assert_trace(const char *assertion, const char *filename,
const char *func, unsigned line, long val)
{
if (!val)
return;
if (assertion)
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 %ld.\n",
filename, line, func, val);
print_trace();
abort();
exit(1);
}
#endif
static inline void warning_trace(const char *assertion, const char *filename,
const char *func, unsigned line, long val,
int trace)
const char *func, unsigned line, long val)
{
if (!val)
return;
@ -120,8 +102,7 @@ static inline void warning_trace(const char *assertion, const char *filename,
"%s:%d: %s: Warning: assertion failed, value %ld.\n",
filename, line, func, val);
#ifndef BTRFS_DISABLE_BACKTRACE
if (trace)
print_trace();
print_trace();
#endif
}
@ -296,13 +277,23 @@ static inline long IS_ERR(const void *ptr)
#define vfree(x) free(x)
#ifndef BTRFS_DISABLE_BACKTRACE
static inline void assert_trace(const char *assertion, const char *filename,
const char *func, unsigned line, long val)
{
if (!val)
return;
warning_trace(assertion, filename, func, line, val);
abort();
exit(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 WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, (long)(c))
#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__, (long)(c), 0)
#define WARN_ON(c) warning_trace(#c, __FILE__, __func__, __LINE__, (long)(c))
#define ASSERT(c) assert(!(c))
#define BUG() assert(0)
#endif