Commit 541003b5 authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2e2d64ae

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/open.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

io_uring/openclose.c

+1 −1
Original line number Diff line number Diff line
@@ -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