diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-11-23 17:33:24 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-11-28 12:42:31 +0100 |
| commit | 416b0d16590b1b79d18990e62f5a95f96ec554b7 (patch) | |
| tree | 0990123ca93b47541c7e5646292e7e339b227fd7 /fs/namespace.c | |
| parent | 542a40654342ecefe75e2786c086ac5950d96fa3 (diff) | |
namespace: convert open_tree_attr() to FD_PREPARE()
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-6-b6efa1706cfd@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 3cf3fa27117d..0c4024558c13 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5023,19 +5023,17 @@ SYSCALL_DEFINE5(open_tree_attr, int, dfd, const char __user *, filename, unsigned, flags, struct mount_attr __user *, uattr, size_t, usize) { - struct file __free(fput) *file = NULL; - int fd; - if (!uattr && usize) return -EINVAL; - file = vfs_open_tree(dfd, filename, flags); - if (IS_ERR(file)) - return PTR_ERR(file); + FD_PREPARE(fdf, flags, vfs_open_tree(dfd, filename, flags)); + if (fdf.err) + return fdf.err; if (uattr) { - int ret; struct mount_kattr kattr = {}; + struct file *file = fd_prepare_file(fdf); + int ret; if (flags & OPEN_TREE_CLONE) kattr.kflags = MOUNT_KATTR_IDMAP_REPLACE; @@ -5051,12 +5049,7 @@ SYSCALL_DEFINE5(open_tree_attr, int, dfd, const char __user *, filename, return ret; } - fd = get_unused_fd_flags(flags & O_CLOEXEC); - if (fd < 0) - return fd; - - fd_install(fd, no_free_ptr(file)); - return fd; + return fd_publish(fdf); } int show_path(struct seq_file *m, struct dentry *root) |