diff --git a/[refs] b/[refs]
index 32d82b453a54..81ceb1f3f08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d8c85117fbcbaea7718870ad4b1ddd12940d9b0
+refs/heads/master: 4af4c52f34606bdaab6930a845550c6fb02078a4
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index c72b940797fc..1baf1b06fe47 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1628,6 +1628,12 @@ int open_namei(int dfd, const char *pathname, int flag,
 		goto exit;
 	}
 
+	if (IS_ERR(nd->intent.open.file)) {
+		mutex_unlock(&dir->d_inode->i_mutex);
+		error = PTR_ERR(nd->intent.open.file);
+		goto exit_dput;
+	}
+
 	/* Negative dentry, just create the file */
 	if (!path.dentry->d_inode) {
 		if (!IS_POSIXACL(dir->d_inode))