projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[powerpc.git]
/
fs
/
ocfs2
/
cluster
/
ocfs2_heartbeat.h
diff --git
a/fs/ocfs2/cluster/ocfs2_heartbeat.h
b/fs/ocfs2/cluster/ocfs2_heartbeat.h
index
9409606
..
3f4151d
100644
(file)
--- a/
fs/ocfs2/cluster/ocfs2_heartbeat.h
+++ b/
fs/ocfs2/cluster/ocfs2_heartbeat.h
@@
-32,6
+32,7
@@
struct o2hb_disk_heartbeat_block {
__u8 hb_pad1[3];
__le32 hb_cksum;
__le64 hb_generation;
__u8 hb_pad1[3];
__le32 hb_cksum;
__le64 hb_generation;
+ __le32 hb_dead_ms;
};
#endif /* _OCFS2_HEARTBEAT_H */
};
#endif /* _OCFS2_HEARTBEAT_H */