Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/dpcm', 'asoc/fix/dwc...

[mirror_ubuntu-zesty-kernel.git] / fs / ocfs2 / cluster / heartbeat.c

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 636abcbd46501b9c00ef5e3155d6656a161d7d49..f6e871760f8d97265f4974c159dca7a7b6439b7f 100644 (file)
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -627,7 +627,7 @@ static int o2hb_issue_node_write(struct o2hb_region *reg,
        slot = o2nm_this_node();
 
        bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, REQ_OP_WRITE,
-                                WRITE_SYNC);
+                                REQ_SYNC);
        if (IS_ERR(bio)) {
                status = PTR_ERR(bio);
                mlog_errno(status);
@@ -741,7 +741,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
        hb_block = (struct o2hb_disk_heartbeat_block *)slot->ds_raw_block;
        memset(hb_block, 0, reg->hr_block_bytes);
        /* TODO: time stuff */
-       cputime = CURRENT_TIME.tv_sec;
+       cputime = ktime_get_real_seconds();
        if (!cputime)
                cputime = 1;
 
@@ -1250,7 +1250,7 @@ static int o2hb_thread(void *data)
 
                mlog(ML_HEARTBEAT,
                     "start = %lld, end = %lld, msec = %u, ret = %d\n",
-                    before_hb.tv64, after_hb.tv64, elapsed_msec, ret);
+                    before_hb, after_hb, elapsed_msec, ret);
 
                if (!kthread_should_stop() &&
                    elapsed_msec < reg->hr_timeout_ms) {