X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status.c;h=6d0ed9ff6964192ee3f548bc4b17db000e651293;hb=7d5bc476d4420c04c53b82e66647d1cb2319da3e;hp=653b18a0c6ace4c6f49db0bf68bc0c25e13ae321;hpb=cf2f61a0f2ebdd6fdcc16c7c82497988f123ba66;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 653b18a..6d0ed9f 100644
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -1114,9 +1114,8 @@ int lprocfs_state_seq_show(struct seq_file *m, void *data)
 			&imp->imp_state_hist[(k + j) % IMP_STATE_HIST_LEN];
 		if (ish->ish_state == 0)
 			continue;
-		seq_printf(m, " - [ "CFS_TIME_T", %s ]\n",
-			   ish->ish_time,
-		ptlrpc_import_state_name(ish->ish_state));
+		seq_printf(m, " - [ %lld, %s ]\n", (s64)ish->ish_time,
+			   ptlrpc_import_state_name(ish->ish_state));
 	}
 
 	LPROCFS_CLIMP_EXIT(obd);
@@ -1140,7 +1139,7 @@ int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
 	struct obd_device *obd = (struct obd_device *)data;
 	struct obd_import *imp;
 	unsigned int cur, worst;
-	time_t now, worstt;
+	time64_t now, worstt;
 	struct dhms ts;
 	int i;
 
@@ -1148,19 +1147,19 @@ int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
 	LPROCFS_CLIMP_CHECK(obd);
 	imp = obd->u.cli.cl_import;
 
-	now = cfs_time_current_sec();
+	now = ktime_get_real_seconds();
 
 	/* Some network health info for kicks */
 	s2dhms(&ts, now - imp->imp_last_reply_time);
-	seq_printf(m, "%-10s : %ld, "DHMS_FMT" ago\n",
-		   "last reply", imp->imp_last_reply_time, DHMS_VARS(&ts));
+	seq_printf(m, "%-10s : %lld, "DHMS_FMT" ago\n",
+		   "last reply", (s64)imp->imp_last_reply_time, DHMS_VARS(&ts));
 
 	cur = at_get(&imp->imp_at.iat_net_latency);
 	worst = imp->imp_at.iat_net_latency.at_worst_ever;
 	worstt = imp->imp_at.iat_net_latency.at_worst_time;
 	s2dhms(&ts, now - worstt);
-	seq_printf(m, "%-10s : cur %3u  worst %3u (at %ld, "DHMS_FMT" ago) ",
-		   "network", cur, worst, worstt, DHMS_VARS(&ts));
+	seq_printf(m, "%-10s : cur %3u  worst %3u (at %lld, "DHMS_FMT" ago) ",
+		   "network", cur, worst, (s64)worstt, DHMS_VARS(&ts));
 	lprocfs_at_hist_helper(m, &imp->imp_at.iat_net_latency);
 
 	for(i = 0; i < IMP_AT_MAX_PORTALS; i++) {
@@ -1170,9 +1169,9 @@ int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
 		worst = imp->imp_at.iat_service_estimate[i].at_worst_ever;
 		worstt = imp->imp_at.iat_service_estimate[i].at_worst_time;
 		s2dhms(&ts, now - worstt);
-		seq_printf(m, "portal %-2d  : cur %3u  worst %3u (at %ld, "
+		seq_printf(m, "portal %-2d  : cur %3u  worst %3u (at %lld, "
 			   DHMS_FMT" ago) ", imp->imp_at.iat_portal[i],
-			   cur, worst, worstt, DHMS_VARS(&ts));
+			   cur, worst, (s64)worstt, DHMS_VARS(&ts));
 		lprocfs_at_hist_helper(m, &imp->imp_at.iat_service_estimate[i]);
 	}
 
@@ -1451,11 +1450,11 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v)
 	int				 idx	= *(loff_t *)v;
 
 	if (idx == 0) {
-		struct timeval now;
+		struct timespec64 now;
 
-		do_gettimeofday(&now);
-		seq_printf(p, "%-25s %lu.%lu secs.usecs\n",
-			   "snapshot_time", now.tv_sec, now.tv_usec);
+		ktime_get_real_ts64(&now);
+		seq_printf(p, "%-25s %llu.%09lu secs.nsecs\n",
+			   "snapshot_time", (s64)now.tv_sec, now.tv_nsec);
 	}
 
 	hdr = &stats->ls_cnt_header[idx];