vfs: nameidata_to_filp(): don't throw away file on error

If open fails, don't put the file.  This allows it to be reused if open needs to
be retried.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/open.c b/fs/open.c
index 9fd34b76b9593bd0b3a2b280a8481f79215fabda..d6c79a0dffc7b0827b09562e11fa0f610af5657d 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -824,10 +824,11 @@ struct file *nameidata_to_filp(struct nameidata *nd)
 
        /* Pick up the filp from the open intent */
        filp = nd->intent.open.file;
-       nd->intent.open.file = NULL;
 
        /* Has the filesystem initialised the file for us? */
-       if (filp->f_path.dentry == NULL) {
+       if (filp->f_path.dentry != NULL) {
+               nd->intent.open.file = NULL;
+       } else {
                struct file *res;
 
                path_get(&nd->path);
@@ -836,6 +837,7 @@ struct file *nameidata_to_filp(struct nameidata *nd)
                if (!IS_ERR(res)) {
                        int error;
 
+                       nd->intent.open.file = NULL;
                        BUG_ON(res != filp);
 
                        error = open_check_o_direct(filp);
@@ -844,7 +846,7 @@ struct file *nameidata_to_filp(struct nameidata *nd)
                                filp = ERR_PTR(error);
                        }
                } else {
-                       put_filp(filp);
+                       /* Allow nd->intent.open.file to be recycled */
                        filp = res;
                }
        }