[PATCH 1/2] do_io_accounting: use __for_each_thread()

From: Oleg Nesterov
Date: Mon Oct 23 2023 - 11:35:56 EST


rather than while_each_thread() which should be avoided when possible.

This makes the code more clear and allows the next change.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
---
fs/proc/base.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index c0e971cc6d41..0a39412332e2 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2976,7 +2976,7 @@ static const struct file_operations proc_coredump_filter_operations = {
#ifdef CONFIG_TASK_IO_ACCOUNTING
static int do_io_accounting(struct task_struct *task, struct seq_file *m, int whole)
{
- struct task_io_accounting acct = task->ioac;
+ struct task_io_accounting acct;
unsigned long flags;
int result;

@@ -2990,14 +2990,18 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
}

if (whole && lock_task_sighand(task, &flags)) {
- struct task_struct *t = task;
+ struct signal_struct *sig = task->signal;
+ struct task_struct *t;

- task_io_accounting_add(&acct, &task->signal->ioac);
- while_each_thread(task, t)
+ acct = sig->ioac;
+ __for_each_thread(sig, t)
task_io_accounting_add(&acct, &t->ioac);

unlock_task_sighand(task, &flags);
+ } else {
+ acct = task->ioac;
}
+
seq_printf(m,
"rchar: %llu\n"
"wchar: %llu\n"
--
2.25.1.362.g51ebf55