diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 20:44:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 20:44:21 -0400 |
| commit | 501b7c77de3e90519e95fd99e923bf9a29cd120d (patch) | |
| tree | f7dc56286e7309186f335d32f03434e82f31a41d /fs/ocfs2/cluster/ocfs2_heartbeat.h | |
| parent | 74e651f0aa100f3e5d3432a8dd8869c089e8d72f (diff) | |
| parent | 184d7d20d352c7374f70ebca7468dc8cd5cc618a (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()
ocfs2: clean up some osb fields
ocfs2: fix init of uuid_net_key
ocfs2: silence a debug print
ocfs2: silence ENOENT during lookup of broken links
ocfs2: Cleanup message prints
ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup
[PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
ocfs2: warn the user on a dead timeout mismatch
ocfs2: OCFS2_FS must depend on SYSFS
ocfs2: Compile-time disabling of ocfs2 debugging output.
configfs: Clear up a few extra spaces where there should be TABs.
configfs: Release memory in configfs_example.
Diffstat (limited to 'fs/ocfs2/cluster/ocfs2_heartbeat.h')
| -rw-r--r-- | fs/ocfs2/cluster/ocfs2_heartbeat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/cluster/ocfs2_heartbeat.h b/fs/ocfs2/cluster/ocfs2_heartbeat.h index 94096069cb43..3f4151da9709 100644 --- a/fs/ocfs2/cluster/ocfs2_heartbeat.h +++ b/fs/ocfs2/cluster/ocfs2_heartbeat.h | |||
| @@ -32,6 +32,7 @@ struct o2hb_disk_heartbeat_block { | |||
| 32 | __u8 hb_pad1[3]; | 32 | __u8 hb_pad1[3]; |
| 33 | __le32 hb_cksum; | 33 | __le32 hb_cksum; |
| 34 | __le64 hb_generation; | 34 | __le64 hb_generation; |
| 35 | __le32 hb_dead_ms; | ||
| 35 | }; | 36 | }; |
| 36 | 37 | ||
| 37 | #endif /* _OCFS2_HEARTBEAT_H */ | 38 | #endif /* _OCFS2_HEARTBEAT_H */ |