From 28ae787a86541574d2b2cfa947b48a64c3c2e5b2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Wed, 15 Aug 2012 13:30:12 -0700
Subject: [PATCH] --- yaml --- r: 321794 b: refs/heads/master c:
 62b2ce964bb901f00a480104bd35a2e1f8d2cf58 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d18a09a5589e..e9fb84aac528 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af109bca94a8a223c4632a4ff769b3419fe7ed8c
+refs/heads/master: 62b2ce964bb901f00a480104bd35a2e1f8d2cf58
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 26c28ec4f4af..db76b866a097 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2489,6 +2489,10 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
 			dput(dentry);
 			dentry = file->f_path.dentry;
 		}
+		if (create_error && dentry->d_inode == NULL) {
+			error = create_error;
+			goto out;
+		}
 		goto looked_up;
 	}