commit 03da633aa7b08bdc4d86e9c2780bb89277b65cd6
author Al Viro <viro@zeniv.linux.org.uk> Mon Sep 16 19:22:33 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Sep 17 17:08:50 2013 -0400
tree f663ce0d2f49867c6b4f9b0631976a9e7ea9556a
parent 116cc0225381415b96551f725455d067f63a76a0

atomic_open: take care of EEXIST in no-open case with O_CREAT|O_EXCL in fs/namei.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/9p/vfs_inode_dotl.c

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 53687bb..a7c4814 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -267,14 +267,8 @@
 	}
 
 	/* Only creates */
-	if (!(flags & O_CREAT))
+	if (!(flags & O_CREAT) || dentry->d_inode)
 		return	finish_no_open(file, res);
-	else if (dentry->d_inode) {
-		if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-			return -EEXIST;
-		else
-			return finish_no_open(file, res);
-	}
 
 	v9ses = v9fs_inode2v9ses(dir);