Skip to content

Commit 541003b

Browse files
author
Al Viro
committed
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>
1 parent 2e2d64a commit 541003b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

fs/exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
780780
if (flags & AT_EMPTY_PATH)
781781
open_exec_flags.lookup_flags |= LOOKUP_EMPTY;
782782

783-
file = do_filp_open(fd, name, &open_exec_flags);
783+
file = do_file_open(fd, name, &open_exec_flags);
784784
if (IS_ERR(file))
785785
return file;
786786

fs/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ struct open_flags {
190190
int intent;
191191
int lookup_flags;
192192
};
193-
extern struct file *do_filp_open(int dfd, struct filename *pathname,
193+
extern struct file *do_file_open(int dfd, struct filename *pathname,
194194
const struct open_flags *op);
195195
extern struct file *do_file_open_root(const struct path *,
196196
const char *, const struct open_flags *);

fs/namei.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4864,7 +4864,7 @@ static struct file *path_openat(struct nameidata *nd,
48644864
return ERR_PTR(error);
48654865
}
48664866

4867-
struct file *do_filp_open(int dfd, struct filename *pathname,
4867+
struct file *do_file_open(int dfd, struct filename *pathname,
48684868
const struct open_flags *op)
48694869
{
48704870
struct nameidata nd;

fs/open.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ struct file *file_open_name(struct filename *name, int flags, umode_t mode)
13821382
int err = build_open_flags(&how, &op);
13831383
if (err)
13841384
return ERR_PTR(err);
1385-
return do_filp_open(AT_FDCWD, name, &op);
1385+
return do_file_open(AT_FDCWD, name, &op);
13861386
}
13871387

13881388
/**
@@ -1436,7 +1436,7 @@ static int do_sys_openat2(int dfd, const char __user *filename,
14361436
if (IS_ERR(tmp))
14371437
return PTR_ERR(tmp);
14381438

1439-
return FD_ADD(how->flags, do_filp_open(dfd, tmp, &op));
1439+
return FD_ADD(how->flags, do_file_open(dfd, tmp, &op));
14401440
}
14411441

14421442
int do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)

io_uring/openclose.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int io_openat2(struct io_kiocb *req, unsigned int issue_flags)
138138
goto err;
139139
}
140140

141-
file = do_filp_open(open->dfd, name, &op);
141+
file = do_file_open(open->dfd, name, &op);
142142
if (IS_ERR(file)) {
143143
/*
144144
* We could hang on to this 'fd' on retrying, but seems like

0 commit comments

Comments
 (0)