Merge tag 'v4.1.25' into linux-linaro-lsk-v4.1lsk-v4.1-16.05

 This is the 4.1.25 stable release

1 files changed, 4 insertions, 16 deletions

diff --git a/fs/namei.c b/fs/namei.c
index f3cc848da8bc..c7a6eabc02a5 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2839,22 +2839,10 @@ no_open:
 		dentry = lookup_real(dir, dentry, nd->flags);
 		if (IS_ERR(dentry))
 			return PTR_ERR(dentry);
-
-		if (create_error) {
-			int open_flag = op->open_flag;
-
-			error = create_error;
-			if ((open_flag & O_EXCL)) {
-				if (!dentry->d_inode)
-					goto out;
-			} else if (!dentry->d_inode) {
-				goto out;
-			} else if ((open_flag & O_TRUNC) &&
-				   d_is_reg(dentry)) {
-				goto out;
-			}
-			/* will fail later, go on to get the right error */
-		}
+	}
+	if (create_error && !dentry->d_inode) {
+		error = create_error;
+		goto out;
 	}
 looked_up:
 	path->dentry = dentry;