Messages in this thread Patch in this message | | | From | Miklos Szeredi <> | Subject | [PATCH 13/16] vfs: nameidata_to_filp(): inline __dentry_open() | Date | Wed, 25 Apr 2012 14:44:14 +0200 |
| |
From: Miklos Szeredi <mszeredi@suse.cz>
Copy __dentry_open() into nameidata_to_filp().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> --- fs/open.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/fs/open.c b/fs/open.c index e1448cd..161c15f 100644 --- a/fs/open.c +++ b/fs/open.c @@ -818,9 +818,25 @@ struct file *nameidata_to_filp(struct nameidata *nd) /* Has the filesystem initialised the file for us? */ if (filp->f_path.dentry == NULL) { + struct file *res; + path_get(&nd->path); - filp = __dentry_open(nd->path.dentry, nd->path.mnt, filp, - NULL, cred); + res = do_dentry_open(nd->path.dentry, nd->path.mnt, + filp, NULL, cred); + if (!IS_ERR(res)) { + int error; + + BUG_ON(res != filp); + + error = open_check_o_direct(filp); + if (error) { + fput(filp); + filp = ERR_PTR(error); + } + } else { + put_filp(filp); + filp = res; + } } return filp; } -- 1.7.7
| |