diff options
Diffstat (limited to 'include/linux/reiserfs_fs.h')
-rw-r--r-- | include/linux/reiserfs_fs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 65bb5e3e3abe..056e2a3b04e3 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
@@ -79,7 +79,10 @@ struct fid; | |||
79 | */ | 79 | */ |
80 | #define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ | 80 | #define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ |
81 | 81 | ||
82 | void reiserfs_warning(struct super_block *s, const char *fmt, ...); | 82 | void __reiserfs_warning(struct super_block *s, const char *id, |
83 | const char *func, const char *fmt, ...); | ||
84 | #define reiserfs_warning(s, id, fmt, args...) \ | ||
85 | __reiserfs_warning(s, id, __func__, fmt, ##args) | ||
83 | /* assertions handling */ | 86 | /* assertions handling */ |
84 | 87 | ||
85 | /** always check a condition and panic if it's false. */ | 88 | /** always check a condition and panic if it's false. */ |
@@ -558,7 +561,7 @@ static inline int uniqueness2type(__u32 uniqueness) | |||
558 | case V1_DIRENTRY_UNIQUENESS: | 561 | case V1_DIRENTRY_UNIQUENESS: |
559 | return TYPE_DIRENTRY; | 562 | return TYPE_DIRENTRY; |
560 | default: | 563 | default: |
561 | reiserfs_warning(NULL, "vs-500: unknown uniqueness %d", | 564 | reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d", |
562 | uniqueness); | 565 | uniqueness); |
563 | case V1_ANY_UNIQUENESS: | 566 | case V1_ANY_UNIQUENESS: |
564 | return TYPE_ANY; | 567 | return TYPE_ANY; |
@@ -578,7 +581,7 @@ static inline __u32 type2uniqueness(int type) | |||
578 | case TYPE_DIRENTRY: | 581 | case TYPE_DIRENTRY: |
579 | return V1_DIRENTRY_UNIQUENESS; | 582 | return V1_DIRENTRY_UNIQUENESS; |
580 | default: | 583 | default: |
581 | reiserfs_warning(NULL, "vs-501: unknown type %d", type); | 584 | reiserfs_warning(NULL, "vs-501", "unknown type %d", type); |
582 | case TYPE_ANY: | 585 | case TYPE_ANY: |
583 | return V1_ANY_UNIQUENESS; | 586 | return V1_ANY_UNIQUENESS; |
584 | } | 587 | } |