kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vfs: do_dentry_open(): don't put filp

Browse source 
Move put_filp() out to __dentry_open(), the only caller now.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2012-05-21 17:30:16 +02:00 committed by Al Viro
parent 90ad1a8ecb
commit 78f71eff3c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/open.c
View file

@ -747,7 +747,6 @@ cleanup_all:
f->f_path.dentry = NULL; f->f_path.dentry = NULL;
f->f_path.mnt = NULL; f->f_path.mnt = NULL;
cleanup_file: cleanup_file:
put_filp(f);
dput(dentry); dput(dentry);
mntput(mnt); mntput(mnt);
return ERR_PTR(error); return ERR_PTR(error);
@ -765,6 +764,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
fput(res); fput(res);
res = ERR_PTR(error); res = ERR_PTR(error);
} }
} else {
put_filp(f);
} }
return res; return res;
} }