mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
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: I365679079428ea686ebd4879a2200f7de7142bae
This commit is contained in:
parent
396b389355
commit
9003db7756
1 changed files with 2 additions and 2 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue