From: Christian Brauner Date: Sun, 23 Nov 2025 16:33:27 +0000 (+0100) Subject: nsfs: convert open_namespace() to FD_PREPARE() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00de6e244807aa8e9c00cb6ad2976c429058d4ac;p=thirdparty%2Fkernel%2Flinux.git nsfs: convert open_namespace() to FD_PREPARE() Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-9-b6efa1706cfd@kernel.org Signed-off-by: Christian Brauner --- diff --git a/fs/nsfs.c b/fs/nsfs.c index 648dc59bef7f2..339497b1c267a 100644 --- a/fs/nsfs.c +++ b/fs/nsfs.c @@ -108,7 +108,6 @@ int ns_get_path(struct path *path, struct task_struct *task, int open_namespace(struct ns_common *ns) { struct path path __free(path_put) = {}; - struct file *f; int err; /* call first to consume reference */ @@ -116,16 +115,7 @@ int open_namespace(struct ns_common *ns) if (err < 0) return err; - CLASS(get_unused_fd, fd)(O_CLOEXEC); - if (fd < 0) - return fd; - - f = dentry_open(&path, O_RDONLY, current_cred()); - if (IS_ERR(f)) - return PTR_ERR(f); - - fd_install(fd, f); - return take_fd(fd); + return FD_ADD(O_CLOEXEC, dentry_open(&path, O_RDONLY, current_cred())); } int open_related_ns(struct ns_common *ns,