Commit 78f71eff authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro

vfs: do_dentry_open(): don't put filp

Move put_filp() out to __dentry_open(), the only caller now.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 90ad1a8e
...@@ -747,7 +747,6 @@ static struct file *do_dentry_open(struct dentry *dentry, struct vfsmount *mnt, ...@@ -747,7 +747,6 @@ static struct file *do_dentry_open(struct dentry *dentry, struct vfsmount *mnt,
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, ...@@ -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;
} }
......
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