diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-10-10 12:00:03 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-10-30 09:58:02 +0100 |
| commit | 2ec67bb4f9c08000982d6aa0e72511bcc83caeb6 (patch) | |
| tree | b5c0b8fc842d830247b4e01cefdb37d94a2cb2ad /kernel/bpf/task_iter.c | |
| parent | 62eec753cae265002043872ba419d0887fe33ec6 (diff) | |
| parent | 6a8126f077f9d1f33613c9fa3dbd9a6774c6c4dd (diff) | |
Merge branch 'work.fdtable' into vfs.file
Bring in the fdtable changes for this cycle.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel/bpf/task_iter.c')
| -rw-r--r-- | kernel/bpf/task_iter.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c index 02aa9db8d796..7fe602ca74a0 100644 --- a/kernel/bpf/task_iter.c +++ b/kernel/bpf/task_iter.c @@ -5,7 +5,6 @@ #include <linux/namei.h> #include <linux/pid_namespace.h> #include <linux/fs.h> -#include <linux/fdtable.h> #include <linux/filter.h> #include <linux/bpf_mem_alloc.h> #include <linux/btf_ids.h> @@ -286,17 +285,14 @@ again: curr_fd = 0; } - rcu_read_lock(); - f = task_lookup_next_fdget_rcu(curr_task, &curr_fd); + f = fget_task_next(curr_task, &curr_fd); if (f) { /* set info->fd */ info->fd = curr_fd; - rcu_read_unlock(); return f; } /* the current task is done, go to the next task */ - rcu_read_unlock(); put_task_struct(curr_task); if (info->common.type == BPF_TASK_ITER_TID) { |