Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

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,
 static void o2hb_wait_on_io(struct o2hb_region *reg,
                             struct o2hb_bio_wait_ctxt *wc)
 {
-        struct address_space *mapping = reg->hr_bdev->bd_inode->i_mapping;
-
-        blk_run_address_space(mapping);
         o2hb_bio_wait_dec(wc, 1);
-
         wait_for_completion(&wc->wc_io_complete);
 }
 
@@ -1658,8 +1654,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)
         struct o2hb_disk_slot *slot;
         struct o2hb_disk_heartbeat_block *hb_block;
 
-        mlog_entry_void();
-
         ret = o2hb_read_slots(reg, reg->hr_blocks);
         if (ret) {
                 mlog_errno(ret);
@@ -1681,7 +1675,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)
         }
 
 out:
-        mlog_exit(ret);
         return ret;
 }
 
@@ -2282,7 +2275,7 @@ void o2hb_free_hb_set(struct config_group *group)
         kfree(hs);
 }
 
-/* hb callback registration and issueing */
+/* hb callback registration and issuing */
 
 static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type)
 {