sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

fs ubifs: Use pr_* for printing messages 

Unline the printk(KERN_* the pr_* functions cooperate with the
barebox loglevel.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-01-13 10:57:34 +01:00
parent d95f27aaa8
commit 278850a442
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ubifs/debug.h
View File

@ -85,7 +85,7 @@ struct ubifs_debug_info {
#define ubifs_assert(expr) do { \
if (unlikely(!(expr))) { \
printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \
pr_crit("UBIFS assert failed in %s at %u (pid %d)\n", \
__func__, __LINE__, 0); \
dbg_dump_stack(); \
} \
@ -94,7 +94,7 @@ struct ubifs_debug_info {
#define ubifs_assert_cmt_locked(c) do { \
if (unlikely(down_write_trylock(&(c)->commit_sem))) { \
up_write(&(c)->commit_sem); \
printk(KERN_CRIT "commit lock is not locked!\n"); \
pr_crit("commit lock is not locked!\n"); \
ubifs_assert(0); \
} \
} while (0)
@ -107,7 +107,7 @@ struct ubifs_debug_info {
/* Generic debugging messages */
#define dbg_msg(fmt, ...) do { \
spin_lock(&dbg_lock); \
printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", 0, \
pr_debug("UBIFS DBG (pid %d): %s: " fmt "\n", 0, \
__func__, ##__VA_ARGS__); \
spin_unlock(&dbg_lock); \
} while (0)
@ -310,7 +310,7 @@ void ubifs_debugging_exit(struct ubifs_info *c);
/* Use "if (0)" to make compiler check arguments even if debugging is off */
#define ubifs_assert(expr) do { \
if (0 && (expr)) \
printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \
pr_crit("UBIFS assert failed in %s at %u (pid %d)\n", \
__func__, __LINE__, 0); \
} while (0)
@ -321,7 +321,7 @@ void ubifs_debugging_exit(struct ubifs_info *c);
#define dbg_msg(fmt, ...) do { \
if (0) \
printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", \
pr_debug("UBIFS DBG (pid %d): %s: " fmt "\n", \
0, __func__, ##__VA_ARGS__); \
} while (0)

6
fs/ubifs/ubifs.h
View File

@ -474,15 +474,15 @@ static inline ino_t parent_ino(struct dentry *dentry)
#define ubifs_msg(fmt, ...)
#else
#define ubifs_msg(fmt, ...) \
printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
pr_notice("UBIFS: " fmt "\n", ##__VA_ARGS__)
#endif
/* UBIFS error messages */
#define ubifs_err(fmt, ...) \
printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \
pr_err("UBIFS error (pid %d): %s: " fmt "\n", 0, \
__func__, ##__VA_ARGS__)
/* UBIFS warning messages */
#define ubifs_warn(fmt, ...) \
printk(KERN_WARNING "UBIFS warning (pid %d): %s: " fmt "\n", \
pr_warn("UBIFS warning (pid %d): %s: " fmt "\n", \
0, __func__, ##__VA_ARGS__)
/* UBIFS file system VFS magic number */