diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/ntfs/debug.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ntfs/debug.h')
| -rw-r--r-- | fs/ntfs/debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h index 8ac37c33d127..5e6724c1afd1 100644 --- a/fs/ntfs/debug.h +++ b/fs/ntfs/debug.h | |||
| @@ -45,7 +45,7 @@ static void ntfs_debug(const char *f, ...); | |||
| 45 | extern void __ntfs_debug (const char *file, int line, const char *function, | 45 | extern void __ntfs_debug (const char *file, int line, const char *function, |
| 46 | const char *format, ...) __attribute__ ((format (printf, 4, 5))); | 46 | const char *format, ...) __attribute__ ((format (printf, 4, 5))); |
| 47 | #define ntfs_debug(f, a...) \ | 47 | #define ntfs_debug(f, a...) \ |
| 48 | __ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a) | 48 | __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a) |
| 49 | 49 | ||
| 50 | extern void ntfs_debug_dump_runlist(const runlist_element *rl); | 50 | extern void ntfs_debug_dump_runlist(const runlist_element *rl); |
| 51 | 51 | ||
| @@ -58,10 +58,10 @@ extern void ntfs_debug_dump_runlist(const runlist_element *rl); | |||
| 58 | 58 | ||
| 59 | extern void __ntfs_warning(const char *function, const struct super_block *sb, | 59 | extern void __ntfs_warning(const char *function, const struct super_block *sb, |
| 60 | const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); | 60 | const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); |
| 61 | #define ntfs_warning(sb, f, a...) __ntfs_warning(__FUNCTION__, sb, f, ##a) | 61 | #define ntfs_warning(sb, f, a...) __ntfs_warning(__func__, sb, f, ##a) |
| 62 | 62 | ||
| 63 | extern void __ntfs_error(const char *function, const struct super_block *sb, | 63 | extern void __ntfs_error(const char *function, const struct super_block *sb, |
| 64 | const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); | 64 | const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); |
| 65 | #define ntfs_error(sb, f, a...) __ntfs_error(__FUNCTION__, sb, f, ##a) | 65 | #define ntfs_error(sb, f, a...) __ntfs_error(__func__, sb, f, ##a) |
| 66 | 66 | ||
| 67 | #endif /* _LINUX_NTFS_DEBUG_H */ | 67 | #endif /* _LINUX_NTFS_DEBUG_H */ |