Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243014
b: refs/heads/master
c: b5770f9
h: refs/heads/master
v: v3
  • Loading branch information
Tao Ma committed Feb 23, 2011
1 parent 7df9fec commit 388a705
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a8731086eff053b430cddbf5783654dfd700ea06
refs/heads/master: b5770f98b00e94dd573e3438427de09733fe2039
4 changes: 2 additions & 2 deletions trunk/fs/ocfs2/heartbeat.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <linux/types.h>
#include <linux/highmem.h>

#define MLOG_MASK_PREFIX ML_SUPER
#include <cluster/masklog.h>

#include "ocfs2.h"
Expand All @@ -37,6 +36,7 @@
#include "heartbeat.h"
#include "inode.h"
#include "journal.h"
#include "ocfs2_trace.h"

#include "buffer_head_io.h"

Expand Down Expand Up @@ -66,7 +66,7 @@ void ocfs2_do_node_down(int node_num, void *data)

BUG_ON(osb->node_num == node_num);

mlog(0, "ocfs2: node down event for %d\n", node_num);
trace_ocfs2_do_node_down(node_num);

if (!osb->cconn) {
/*
Expand Down
7 changes: 7 additions & 0 deletions trunk/fs/ocfs2/ocfs2_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -1530,6 +1530,13 @@ DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_map_slot_buffers_block);
DEFINE_OCFS2_INT_EVENT(ocfs2_find_slot);

/* End of trace events for fs/ocfs2/slot_map.c. */

/* Trace events for fs/ocfs2/heartbeat.c. */

DEFINE_OCFS2_INT_EVENT(ocfs2_do_node_down);

/* End of trace events for fs/ocfs2/heartbeat.c. */

#endif /* _TRACE_OCFS2_H */

/* This part must be outside protection */
Expand Down

0 comments on commit 388a705

Please sign in to comment.