Revert "proc: io_accounting: Use new infrastructure to fix deadlocks in execve"

This reverts commit ba7eb0e48e which is
commit 6914303824bb572278568330d72fc1f8f9814e67 upstream.

It breaks the API and we don't need it right now in the 5.4 tree.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia97edb0210699760a68bb72af80b494c34d60e62
This commit is contained in:
Greg Kroah-Hartman 2020-10-01 20:25:35 +02:00
commit cdc9e06d57

View file

@ -2770,7 +2770,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
unsigned long flags;
int result;
result = mutex_lock_killable(&task->signal->exec_update_mutex);
result = mutex_lock_killable(&task->signal->cred_guard_mutex);
if (result)
return result;
@ -2806,7 +2806,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
result = 0;
out_unlock:
mutex_unlock(&task->signal->exec_update_mutex);
mutex_unlock(&task->signal->cred_guard_mutex);
return result;
}