From 03da633aa7b08bdc4d86e9c2780bb89277b65cd6 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 16 Sep 2013 19:22:33 -0400 Subject: atomic_open: take care of EEXIST in no-open case with O_CREAT|O_EXCL in fs/namei.c Signed-off-by: Al Viro --- fs/9p/vfs_inode_dotl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'fs/9p/vfs_inode_dotl.c') diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index 53687bbf2296..a7c481402c46 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c @@ -267,14 +267,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, } /* 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); -- cgit v1.2.3