diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 18:29:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 18:29:08 -0400 |
| commit | 4e337adae4e960f64043b9f433c4a825c902616c (patch) | |
| tree | 407ea9edaec1ec666e5a0a6368dc51be2bc913c9 /fs/ocfs2/cluster/heartbeat.h | |
| parent | 0bdd0f385a44344f83409b9e00797bfe2596faf8 (diff) | |
| parent | b36c3f84988eebf38acaccc756e05f6b70e333ab (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2_dlm: Add missing locks in dlm_empty_lockres
ocfs2_dlm: Missing get/put lockres in dlm_run_purge_lockres
configfs: add missing mutex_unlock()
ocfs2: add some missing address space callbacks
ocfs2: Concurrent access of o2hb_region->hr_task was not locked
ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks()
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.h')
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.h b/fs/ocfs2/cluster/heartbeat.h index cac6223206a9..cc6d40b39771 100644 --- a/fs/ocfs2/cluster/heartbeat.h +++ b/fs/ocfs2/cluster/heartbeat.h | |||
| @@ -70,7 +70,7 @@ void o2hb_setup_callback(struct o2hb_callback_func *hc, | |||
| 70 | void *data, | 70 | void *data, |
| 71 | int priority); | 71 | int priority); |
| 72 | int o2hb_register_callback(struct o2hb_callback_func *hc); | 72 | int o2hb_register_callback(struct o2hb_callback_func *hc); |
| 73 | int o2hb_unregister_callback(struct o2hb_callback_func *hc); | 73 | void o2hb_unregister_callback(struct o2hb_callback_func *hc); |
| 74 | void o2hb_fill_node_map(unsigned long *map, | 74 | void o2hb_fill_node_map(unsigned long *map, |
| 75 | unsigned bytes); | 75 | unsigned bytes); |
| 76 | void o2hb_init(void); | 76 | void o2hb_init(void); |