Commit 3d8a00d2 authored by Al Viro's avatar Al Viro

don't modify od->filp at all

make put_filp() conditional on flag set by finish_open()
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 47237687
......@@ -2708,10 +2708,8 @@ out:
path_put(&nd->root);
if (base)
fput(base);
if (od.filp) {
BUG_ON(od.filp->f_path.dentry);
if (!(opened & FILE_OPENED))
put_filp(od.filp);
}
if (res == ERR_PTR(-EOPENSTALE)) {
if (flags & LOOKUP_RCU)
res = ERR_PTR(-ECHILD);
......
......@@ -786,15 +786,14 @@ struct file *finish_open(struct opendata *od, struct dentry *dentry,
int *opened)
{
struct file *res;
BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
mntget(od->mnt);
dget(dentry);
res = do_dentry_open(dentry, od->mnt, od->filp, open, current_cred());
if (!IS_ERR(res)) {
if (!IS_ERR(res))
*opened |= FILE_OPENED;
od->filp = NULL;
}
return res;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment