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>

diff --git a/fs/namei.c b/fs/namei.c
index 7a33f07..18b9326 100644 (file)
--- 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 89589bd..c87f982 100644 (file)
--- 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;
 }