From f202676711ad7a82f7408dad02ab9511c26ed96e Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <pshilovsky@samba.org>
Date: Fri, 17 Aug 2012 18:02:19 +0400
Subject: [PATCH] --- yaml --- r: 322463 b: refs/heads/master c:
 ea7b4887e7266b93fa0c203cc452a926a0fef4f0 h: refs/heads/master i:   322461:
 2276fb70cbf2096aa6c0c5c3a4b115cc34b3bc9e   322459:
 c5f77a050a155f003ecf3c99d112e47234215801   322455:
 a566cc5f498ec0e41b2afb737ba580503b81b498   322447:
 e0bd8454f0eb41030dcbea337a00693368e7cb6f   322431:
 737755d7a0d2ef98be08f4888afb4960013ea2a0 v: v3

---
 [refs]              | 2 +-
 trunk/fs/cifs/dir.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4ef9e795c6a9..6126aa43f4ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985e4ff016b5f3d95c12fe8073d1df89300dab3d
+refs/heads/master: ea7b4887e7266b93fa0c203cc452a926a0fef4f0
diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c
index cbe709ad6663..781025be48bc 100644
--- a/trunk/fs/cifs/dir.c
+++ b/trunk/fs/cifs/dir.c
@@ -356,19 +356,12 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 cifs_create_set_dentry:
 	if (rc != 0) {
 		cFYI(1, "Create worked, get_inode_info failed rc = %d", rc);
+		CIFSSMBClose(xid, tcon, *fileHandle);
 		goto out;
 	}
 	d_drop(direntry);
 	d_add(direntry, newinode);
 
-	/* ENOENT for create?  How weird... */
-	rc = -ENOENT;
-	if (!newinode) {
-		CIFSSMBClose(xid, tcon, *fileHandle);
-		goto out;
-	}
-	rc = 0;
-
 out:
 	kfree(buf);
 	kfree(full_path);