Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't modify od->filp at all

Browse Source 
make put_filp() conditional on flag set by finish_open()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-06-10 05:04:43 -04:00
parent 47237687d7
commit 3d8a00d209
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/namei.c
View File

@ -2708,10 +2708,8 @@ static struct file *path_openat(int dfd, const char *pathname,
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);

5
fs/open.c
View File

@ -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;
}