aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/cluster/heartbeat.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
-rw-r--r--fs/ocfs2/cluster/heartbeat.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 5a9779bb9236..0f2cfecd42c0 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1682,7 +1682,7 @@ out:
1682} 1682}
1683EXPORT_SYMBOL_GPL(o2hb_register_callback); 1683EXPORT_SYMBOL_GPL(o2hb_register_callback);
1684 1684
1685int o2hb_unregister_callback(struct o2hb_callback_func *hc) 1685void o2hb_unregister_callback(struct o2hb_callback_func *hc)
1686{ 1686{
1687 BUG_ON(hc->hc_magic != O2HB_CB_MAGIC); 1687 BUG_ON(hc->hc_magic != O2HB_CB_MAGIC);
1688 1688
@@ -1690,15 +1690,13 @@ int o2hb_unregister_callback(struct o2hb_callback_func *hc)
1690 __builtin_return_address(0), hc); 1690 __builtin_return_address(0), hc);
1691 1691
1692 if (list_empty(&hc->hc_item)) 1692 if (list_empty(&hc->hc_item))
1693 return 0; 1693 return;
1694 1694
1695 down_write(&o2hb_callback_sem); 1695 down_write(&o2hb_callback_sem);
1696 1696
1697 list_del_init(&hc->hc_item); 1697 list_del_init(&hc->hc_item);
1698 1698
1699 up_write(&o2hb_callback_sem); 1699 up_write(&o2hb_callback_sem);
1700
1701 return 0;
1702} 1700}
1703EXPORT_SYMBOL_GPL(o2hb_unregister_callback); 1701EXPORT_SYMBOL_GPL(o2hb_unregister_callback);
1704 1702