mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-06 06:21:31 +00:00
[PATCH] merge open_namei() and do_filp_open()
open_namei() will, in the future, need to take mount write counts over its creation and truncation (via may_open()) operations. It needs to keep these write counts until any potential filp that is created gets __fput()'d. This gets complicated in the error handling and becomes very murky as to how far open_namei() actually got, and whether or not that mount write count was taken. That makes it a bad interface. All that the current do_filp_open() really does is allocate the nameidata on the stack, then call open_namei(). So, this merges those two functions and moves filp_open() over to namei.c so it can be close to its buddy: do_filp_open(). It also gets a kerneldoc comment in the process. Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
d57999e152
commit
a70e65df88
3 changed files with 59 additions and 63 deletions
19
fs/open.c
19
fs/open.c
|
@ -796,25 +796,6 @@ cleanup_file:
|
|||
return ERR_PTR(error);
|
||||
}
|
||||
|
||||
static struct file *do_filp_open(int dfd, const char *filename, int flags,
|
||||
int mode)
|
||||
{
|
||||
int error;
|
||||
struct nameidata nd;
|
||||
|
||||
error = open_namei(dfd, filename, flags, mode, &nd);
|
||||
if (!error)
|
||||
return nameidata_to_filp(&nd, flags);
|
||||
|
||||
return ERR_PTR(error);
|
||||
}
|
||||
|
||||
struct file *filp_open(const char *filename, int flags, int mode)
|
||||
{
|
||||
return do_filp_open(AT_FDCWD, filename, flags, mode);
|
||||
}
|
||||
EXPORT_SYMBOL(filp_open);
|
||||
|
||||
/**
|
||||
* lookup_instantiate_filp - instantiates the open intent filp
|
||||
* @nd: pointer to nameidata
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue