From 3d8a00d2099ebc6d5a6e95fadaf861709d9919a8 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 10 Jun 2012 05:04:43 -0400
Subject: [PATCH] don't modify od->filp at all
make put_filp() conditional on flag set by finish_open()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 4 +---
fs/open.c | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 7a33f074e5bd3c..18b9326d951f06 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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);
diff --git a/fs/open.c b/fs/open.c
index 89589bd3993cac..c87f98201c2990 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -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;
}
--
GitLab