summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2026-09-17 11:09:45 +0200
committerChristian Brauner <brauner@kernel.org>2026-09-23 09:27:44 +0200
commit64cbb36448ff22ce8400744e296888efef1d1c04 (patch)
tree9bb168a6f89471f26618eecc9e1fe0209bd65d7d /kernel
parent9e4f1bc488bd799f22c8087544adcee9620d0f44 (diff)
file: make struct fd_prepare const and kill its err field
FD_PREPARE() releases the fd as soon as the file expression fails. The fd either holds the descriptor or the error. The separate field is redundant. Make fd and file plain members and struct fd_prepare simpler. Callers of FD_PREPARE() get a const pointer to the guard. Simplify all users as they can now easily access the trivial struct. No functional changes. Link: https://patch.msgid.link/20260917-work-file-fd_prepare-v1-4-b87534ca49f3@kernel.org Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/bpf_iter.c6
-rw-r--r--kernel/bpf/token.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
index 14a5fdfa0421..5f790d12f72e 100644
--- a/kernel/bpf/bpf_iter.c
+++ b/kernel/bpf/bpf_iter.c
@@ -643,11 +643,11 @@ int bpf_iter_new_fd(struct bpf_link *link)
flags = O_RDONLY | O_CLOEXEC;
FD_PREPARE(fdf, flags, anon_inode_getfile("bpf_iter", &bpf_iter_fops, NULL, flags));
- if (fdf.err)
- return fdf.err;
+ if (fdf->fd < 0)
+ return fdf->fd;
iter_link = container_of(link, struct bpf_iter_link, link);
- err = prepare_seq_file(fd_prepare_file(fdf), iter_link);
+ err = prepare_seq_file(fdf->file, iter_link);
if (err)
return err; /* Automatic cleanup handles fput */
diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c
index e85a179523f0..da915a4f972b 100644
--- a/kernel/bpf/token.c
+++ b/kernel/bpf/token.c
@@ -169,8 +169,8 @@ int bpf_token_create(union bpf_attr *attr)
FD_PREPARE(fdf, O_CLOEXEC,
alloc_file_pseudo(inode, path.mnt, BPF_TOKEN_INODE_NAME,
O_RDWR, &bpf_token_fops));
- if (fdf.err)
- return fdf.err;
+ if (fdf->fd < 0)
+ return fdf->fd;
token = kzalloc_obj(*token, GFP_USER);
if (!token)
@@ -190,7 +190,7 @@ int bpf_token_create(union bpf_attr *attr)
return err;
get_user_ns(token->userns);
- fd_prepare_file(fdf)->private_data = no_free_ptr(token);
+ fdf->file->private_data = no_free_ptr(token);
return fd_publish(fdf);
}