---

yaml --- r: 320968 b: refs/heads/master c: f8310c5 h: refs/heads/master v: v3
git-mirror · Jul 30, 2012 · 22ba816 · 22ba816
1 parent 3a59811
commit 22ba816
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf8848918d751c1fb86f6514a75bf8d406f1c3c3
+refs/heads/master: f8310c59201b183ebee2e3fe0c7242f5729be0af
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -2418,7 +2418,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
 	if ((open_flag & O_CREAT) && !IS_POSIXACL(dir))
 		mode &= ~current_umask();
 
-	if (open_flag & O_EXCL) {
+	if ((open_flag & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT)) {
 		open_flag &= ~O_TRUNC;
 		*opened |= FILE_CREATED;
 	}
@@ -2742,7 +2742,7 @@ static int do_last(struct nameidata *nd, struct path *path,
 	}
 
 	error = -EEXIST;
-	if (open_flag & O_EXCL)
+	if ((open_flag & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT))
 		goto exit_dput;
 
 	error = follow_managed(path, nd->flags);