diff options
Diffstat (limited to 'fs/ocfs2/cluster/masklog.h')
-rw-r--r-- | fs/ocfs2/cluster/masklog.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h index 34d6544357d9..6e20877436b9 100644 --- a/fs/ocfs2/cluster/masklog.h +++ b/fs/ocfs2/cluster/masklog.h | |||
@@ -82,7 +82,6 @@ | |||
82 | 82 | ||
83 | /* bits that are frequently given and infrequently matched in the low word */ | 83 | /* bits that are frequently given and infrequently matched in the low word */ |
84 | /* NOTE: If you add a flag, you need to also update masklog.c! */ | 84 | /* NOTE: If you add a flag, you need to also update masklog.c! */ |
85 | #define ML_ENTRY 0x0000000000000001ULL /* func call entry */ | ||
86 | #define ML_EXIT 0x0000000000000002ULL /* func call exit */ | 85 | #define ML_EXIT 0x0000000000000002ULL /* func call exit */ |
87 | #define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */ | 86 | #define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */ |
88 | #define ML_MSG 0x0000000000000008ULL /* net network messages */ | 87 | #define ML_MSG 0x0000000000000008ULL /* net network messages */ |
@@ -124,7 +123,7 @@ | |||
124 | #define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */ | 123 | #define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */ |
125 | 124 | ||
126 | #define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE) | 125 | #define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE) |
127 | #define MLOG_INITIAL_NOT_MASK (ML_ENTRY|ML_EXIT) | 126 | #define MLOG_INITIAL_NOT_MASK (ML_EXIT) |
128 | #ifndef MLOG_MASK_PREFIX | 127 | #ifndef MLOG_MASK_PREFIX |
129 | #define MLOG_MASK_PREFIX 0 | 128 | #define MLOG_MASK_PREFIX 0 |
130 | #endif | 129 | #endif |
@@ -223,14 +222,6 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
223 | } while (0) | 222 | } while (0) |
224 | 223 | ||
225 | #if defined(CONFIG_OCFS2_DEBUG_MASKLOG) | 224 | #if defined(CONFIG_OCFS2_DEBUG_MASKLOG) |
226 | #define mlog_entry(fmt, args...) do { \ | ||
227 | mlog(ML_ENTRY, "ENTRY:" fmt , ##args); \ | ||
228 | } while (0) | ||
229 | |||
230 | #define mlog_entry_void() do { \ | ||
231 | mlog(ML_ENTRY, "ENTRY:\n"); \ | ||
232 | } while (0) | ||
233 | |||
234 | /* | 225 | /* |
235 | * We disable this for sparse. | 226 | * We disable this for sparse. |
236 | */ | 227 | */ |
@@ -267,8 +258,6 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
267 | mlog(ML_EXIT, "EXIT\n"); \ | 258 | mlog(ML_EXIT, "EXIT\n"); \ |
268 | } while (0) | 259 | } while (0) |
269 | #else | 260 | #else |
270 | #define mlog_entry(...) do { } while (0) | ||
271 | #define mlog_entry_void(...) do { } while (0) | ||
272 | #define mlog_exit(...) do { } while (0) | 261 | #define mlog_exit(...) do { } while (0) |
273 | #define mlog_exit_ptr(...) do { } while (0) | 262 | #define mlog_exit_ptr(...) do { } while (0) |
274 | #define mlog_exit_void(...) do { } while (0) | 263 | #define mlog_exit_void(...) do { } while (0) |