diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
| commit | 0422fe2666aea4c0986f4c89dc107731aa6a7a81 (patch) | |
| tree | 1d42a146a738fb933f061424751755e630aeccb0 /block/ioprio.c | |
| parent | 4b3ddc6462e83452182177b48c4bc53607acd68e (diff) | |
| parent | d1587f7bfe9a0f97a75d42ac1489aeda551106bc (diff) | |
| download | linux-0422fe2666aea4c0986f4c89dc107731aa6a7a81.tar.bz2 | |
Merge branch 'linus' into irq/core, to fix conflict
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block/ioprio.c')
| -rw-r--r-- | block/ioprio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/ioprio.c b/block/ioprio.c index 313c14a70bbd..6f01d35a5145 100644 --- a/block/ioprio.c +++ b/block/ioprio.c @@ -220,6 +220,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who) pgrp = task_pgrp(current); else pgrp = find_vpid(who); + read_lock(&tasklist_lock); do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { tmpio = get_task_ioprio(p); if (tmpio < 0) @@ -229,6 +230,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who) else ret = ioprio_best(ret, tmpio); } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); + read_unlock(&tasklist_lock); + break; case IOPRIO_WHO_USER: uid = make_kuid(current_user_ns(), who); |