[RHEL8,COMMIT] ve/proc: fix wrong output in do_task_stat()

Submitted by Konstantin Khorenko on March 10, 2020, 3:01 p.m.

Details

Message ID 202003101501.02AF1EK9024459@finist_co8.work.ct
State New
Series "fixes to VZ8 required for criu"
Headers show

Commit Message

Konstantin Khorenko March 10, 2020, 3:01 p.m.
The commit is pushed to "branch-rh8-4.18.0-80.1.2.vz8.3.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-80.1.2.vz8.3.2
------>
commit 61594c9c8ca62a934b9bdbab133e0a6cf14d5155
Author: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date:   Tue Mar 10 18:01:14 2020 +0300

    ve/proc: fix wrong output in do_task_stat()
    
    Remove printing task_cpu, this part was lost in rebase. Before patch
    we've shown extra entry in position dependant output of /proc/pid/stat,
    that made criu go mad.
    
    https://jira.sw.ru/browse/PSBM-101289
    
    Fixes: c1b073e09d58 ("ve/proc: Show vcpu in do_task_stat()")
    Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 fs/proc/array.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/fs/proc/array.c b/fs/proc/array.c
index eb6f7f451307..e85d0caa6efa 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -617,7 +617,6 @@  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 	seq_put_decimal_ull(m, " ", 0);
 	seq_put_decimal_ull(m, " ", 0);
 	seq_put_decimal_ll(m, " ", task->exit_signal);
-	seq_put_decimal_ll(m, " ", task_cpu(task));
 	seq_put_decimal_ll(m, " ", is_super ? task_cpu(task) : task_vcpu_id(task));
 	seq_put_decimal_ull(m, " ", task->rt_priority);
 	seq_put_decimal_ull(m, " ", task->policy);