diff options
| author | Joel Becker <joel.becker@oracle.com> | 2007-02-03 03:14:30 -0800 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-03-14 14:37:09 -0700 |
| commit | c24f72cc7ca829bbad0532ddf315ace3ae1c359e (patch) | |
| tree | f52e199ba3e426d0713be8d401a1c53336f47b8b /fs/ocfs2/cluster/heartbeat.h | |
| parent | c3442e296517aee733d62fc3fe03211598902c7d (diff) | |
| download | talos-obmc-linux-c24f72cc7ca829bbad0532ddf315ace3ae1c359e.tar.gz talos-obmc-linux-c24f72cc7ca829bbad0532ddf315ace3ae1c359e.zip | |
ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks()
If ocfs2_register_hb_callbacks() succeeds on its first callback but fails
its second, it doesn't release the first on the way out. Fix that.
While we're at it, o2hb_unregister_callback() never returns anything but
0, so let's make it void.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
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, void *data, int priority); int o2hb_register_callback(struct o2hb_callback_func *hc); -int o2hb_unregister_callback(struct o2hb_callback_func *hc); +void o2hb_unregister_callback(struct o2hb_callback_func *hc); void o2hb_fill_node_map(unsigned long *map, unsigned bytes); void o2hb_init(void); |
