diff options
Diffstat (limited to 'fs/fscache/internal.h')
| -rw-r--r-- | fs/fscache/internal.h | 26 | 
1 files changed, 16 insertions, 10 deletions
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h index 4226f6680b0..bc6c08fcfdd 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h @@ -22,6 +22,12 @@   *   */ +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) "FS-Cache: " fmt +  #include <linux/fscache-cache.h>  #include <linux/sched.h> @@ -413,8 +419,8 @@ do {						\  #define ASSERT(X)							\  do {									\  	if (unlikely(!(X))) {						\ -		printk(KERN_ERR "\n");					\ -		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\ +		pr_err("\n");					\ +		pr_err("Assertion failed\n");	\  		BUG();							\  	}								\  } while (0) @@ -422,9 +428,9 @@ do {									\  #define ASSERTCMP(X, OP, Y)						\  do {									\  	if (unlikely(!((X) OP (Y)))) {					\ -		printk(KERN_ERR "\n");					\ -		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\ -		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\ +		pr_err("\n");					\ +		pr_err("Assertion failed\n");	\ +		pr_err("%lx " #OP " %lx is false\n",		\  		       (unsigned long)(X), (unsigned long)(Y));		\  		BUG();							\  	}								\ @@ -433,8 +439,8 @@ do {									\  #define ASSERTIF(C, X)							\  do {									\  	if (unlikely((C) && !(X))) {					\ -		printk(KERN_ERR "\n");					\ -		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\ +		pr_err("\n");					\ +		pr_err("Assertion failed\n");	\  		BUG();							\  	}								\  } while (0) @@ -442,9 +448,9 @@ do {									\  #define ASSERTIFCMP(C, X, OP, Y)					\  do {									\  	if (unlikely((C) && !((X) OP (Y)))) {				\ -		printk(KERN_ERR "\n");					\ -		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\ -		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\ +		pr_err("\n");					\ +		pr_err("Assertion failed\n");	\ +		pr_err("%lx " #OP " %lx is false\n",		\  		       (unsigned long)(X), (unsigned long)(Y));		\  		BUG();							\  	}								\  | 
