1 files changed, 5 insertions, 3 deletions

diff --git a/fs/open.c b/fs/open.c
index 9fd34b76b959..d6c79a0dffc7 100644
--- 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;
                 }
         }