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 <viro@zeniv.linux.org.uk>

diff --git a/fs/exec.c b/fs/exec.c
index 9d5ebc9d15b0d92df77e0f912468d4d71b944174..b7d8081d12eadb8baf330e6ac3390c0f7190c4f7 100644 (file)
--- 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 c7a34412399e2cc16c03c091b71b84494ed201e1..4c4d2733c47a2c901836812d627019fae1a6e7ec 100644 (file)
--- 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 659c92a6d52cf981b5f29229dcd317853abf13b5..65a06fb312af692ed2cde16c55a5b37775083eba 100644 (file)
--- 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 2fea68991d425a40d1f5df4d29a4ce72c16c2c59..3d2e2a2554c5a0e55002dba5814288a519377a5a 100644 (file)
--- 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 aa3acb06247fb9645b6370338a1dfe4ca4ce1040..c09dd14108edf4c300eebddb68b18aa5cd1375c7 100644 (file)
--- 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