diff options
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index b108e863d8f6..643720209a98 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
@@ -367,11 +367,7 @@ static inline void o2hb_bio_wait_dec(struct o2hb_bio_wait_ctxt *wc, | |||
367 | static void o2hb_wait_on_io(struct o2hb_region *reg, | 367 | static void o2hb_wait_on_io(struct o2hb_region *reg, |
368 | struct o2hb_bio_wait_ctxt *wc) | 368 | struct o2hb_bio_wait_ctxt *wc) |
369 | { | 369 | { |
370 | struct address_space *mapping = reg->hr_bdev->bd_inode->i_mapping; | ||
371 | |||
372 | blk_run_address_space(mapping); | ||
373 | o2hb_bio_wait_dec(wc, 1); | 370 | o2hb_bio_wait_dec(wc, 1); |
374 | |||
375 | wait_for_completion(&wc->wc_io_complete); | 371 | wait_for_completion(&wc->wc_io_complete); |
376 | } | 372 | } |
377 | 373 | ||
@@ -1658,8 +1654,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) | |||
1658 | struct o2hb_disk_slot *slot; | 1654 | struct o2hb_disk_slot *slot; |
1659 | struct o2hb_disk_heartbeat_block *hb_block; | 1655 | struct o2hb_disk_heartbeat_block *hb_block; |
1660 | 1656 | ||
1661 | mlog_entry_void(); | ||
1662 | |||
1663 | ret = o2hb_read_slots(reg, reg->hr_blocks); | 1657 | ret = o2hb_read_slots(reg, reg->hr_blocks); |
1664 | if (ret) { | 1658 | if (ret) { |
1665 | mlog_errno(ret); | 1659 | mlog_errno(ret); |
@@ -1681,7 +1675,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) | |||
1681 | } | 1675 | } |
1682 | 1676 | ||
1683 | out: | 1677 | out: |
1684 | mlog_exit(ret); | ||
1685 | return ret; | 1678 | return ret; |
1686 | } | 1679 | } |
1687 | 1680 | ||
@@ -2282,7 +2275,7 @@ void o2hb_free_hb_set(struct config_group *group) | |||
2282 | kfree(hs); | 2275 | kfree(hs); |
2283 | } | 2276 | } |
2284 | 2277 | ||
2285 | /* hb callback registration and issueing */ | 2278 | /* hb callback registration and issuing */ |
2286 | 2279 | ||
2287 | static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type) | 2280 | static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type) |
2288 | { | 2281 | { |