[RHEL7,COMMIT] vz_latency/vzwdog: compilation fix

Submitted by Konstantin Khorenko on Aug. 31, 2018, 3:03 p.m.

Details

Message ID 201808311503.w7VF3AZB005748@finist_ce7.work
State New
Series "vz/latencies"
Headers show

Commit Message

Konstantin Khorenko Aug. 31, 2018, 3:03 p.m.
The commit is pushed to "branch-rh7-3.10.0-862.11.6.vz7.71.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.11.6.vz7.71.7
------>
commit 13d94c18b93ad5cbd619f44606367e52f8bd0d49
Author: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date:   Fri Aug 31 18:03:09 2018 +0300

    vz_latency/vzwdog: compilation fix
    
    Fixes: 1914c29eb875 ("/proc/<pid>/vz_latency: Show maximal allocation latency
    in the last second.")
    
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 kernel/ve/vzwdog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/kernel/ve/vzwdog.c b/kernel/ve/vzwdog.c
index def8eee062b5..6ef671d9a25b 100644
--- a/kernel/ve/vzwdog.c
+++ b/kernel/ve/vzwdog.c
@@ -78,12 +78,12 @@  static void update_max_alloc_latency(void)
 
 	for (i = 0; i < KSTAT_ALLOCSTAT_NR; i++)
 		max_alloc_lat[i] = max(max_alloc_lat[i],
-				kstat_glob.alloc_lat[i].last.maxlat);
+				kstat_glob.alloc_lat[i].last.maxlat[0]);
 }
 
 static void update_max_schedule_latency(void)
 {
-	max_sched_lat = max(max_sched_lat, kstat_glob.sched_lat.last.maxlat);
+	max_sched_lat = max(max_sched_lat, kstat_glob.sched_lat.last.maxlat[0]);
 }
 
 static void update_max_latencies(void)
@@ -118,7 +118,7 @@  static void show_alloc_latency(void)
 
 		p = &kstat_glob.alloc_lat[i];
 		spin_lock_irq(&kstat_glb_lock);
-		maxlat = p->last.maxlat;
+		maxlat = p->last.maxlat[0];
 		avg0 = p->avg[0];
 		avg1 = p->avg[1];
 		avg2 = p->avg[2];
@@ -143,7 +143,7 @@  static void show_schedule_latency(void)
 
 	p = &kstat_glob.sched_lat;
 	spin_lock_irq(&kstat_glb_lock);
-	maxlat = p->last.maxlat;
+	maxlat = p->last.maxlat[0];
 	totlat = p->last.totlat;
 	count = p->last.count;
 	avg0 = p->avg[0];