From 541003b576c3e3c328314398a6df76eb3cebf847 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 28 Oct 2025 00:11:45 -0400 Subject: [PATCH] rename do_filp_open() to do_file_open() "filp" thing never made sense; seeing that there are exactly 4 callers in the entire tree (and it's neither exported nor even declared in linux/*/*.h), there's no point keeping that ugliness. FWIW, the 'filp' thing did originate in OSD&I; for some reason Tanenbaum decided to call the object representing an opened file 'struct filp', the last letter standing for 'position'. In all Unices, Linux included, the corresponding object had always been 'struct file'... Signed-off-by: Al Viro --- fs/exec.c | 2 +- fs/internal.h | 2 +- fs/namei.c | 2 +- fs/open.c | 4 ++-- io_uring/openclose.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 9d5ebc9d15b0d..b7d8081d12ead 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -780,7 +780,7 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags) if (flags & AT_EMPTY_PATH) open_exec_flags.lookup_flags |= LOOKUP_EMPTY; - file = do_filp_open(fd, name, &open_exec_flags); + file = do_file_open(fd, name, &open_exec_flags); if (IS_ERR(file)) return file; diff --git a/fs/internal.h b/fs/internal.h index c7a34412399e2..4c4d2733c47a2 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -190,7 +190,7 @@ struct open_flags { int intent; int lookup_flags; }; -extern struct file *do_filp_open(int dfd, struct filename *pathname, +extern struct file *do_file_open(int dfd, struct filename *pathname, const struct open_flags *op); extern struct file *do_file_open_root(const struct path *, const char *, const struct open_flags *); diff --git a/fs/namei.c b/fs/namei.c index 659c92a6d52cf..65a06fb312af6 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -4864,7 +4864,7 @@ static struct file *path_openat(struct nameidata *nd, return ERR_PTR(error); } -struct file *do_filp_open(int dfd, struct filename *pathname, +struct file *do_file_open(int dfd, struct filename *pathname, const struct open_flags *op) { struct nameidata nd; diff --git a/fs/open.c b/fs/open.c index 2fea68991d425..3d2e2a2554c5a 100644 --- a/fs/open.c +++ b/fs/open.c @@ -1382,7 +1382,7 @@ struct file *file_open_name(struct filename *name, int flags, umode_t mode) int err = build_open_flags(&how, &op); if (err) return ERR_PTR(err); - return do_filp_open(AT_FDCWD, name, &op); + return do_file_open(AT_FDCWD, name, &op); } /** @@ -1436,7 +1436,7 @@ static int do_sys_openat2(int dfd, const char __user *filename, if (IS_ERR(tmp)) return PTR_ERR(tmp); - return FD_ADD(how->flags, do_filp_open(dfd, tmp, &op)); + return FD_ADD(how->flags, do_file_open(dfd, tmp, &op)); } int do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) diff --git a/io_uring/openclose.c b/io_uring/openclose.c index aa3acb06247fb..c09dd14108edf 100644 --- a/io_uring/openclose.c +++ b/io_uring/openclose.c @@ -138,7 +138,7 @@ int io_openat2(struct io_kiocb *req, unsigned int issue_flags) goto err; } - file = do_filp_open(open->dfd, name, &op); + file = do_file_open(open->dfd, name, &op); if (IS_ERR(file)) { /* * We could hang on to this 'fd' on retrying, but seems like -- 2.47.3