From dcefd47ebe188afd00c794099af7ba3f466b3c22 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 5 Aug 2010 13:58:38 -0400
Subject: [PATCH] --- yaml --- r: 209999 b: refs/heads/master c:
 232341ba7fa15115d40f6aa0f8dd14e96e3ad375 h: refs/heads/master i:   209997:
 a04d999eaa6144f0a5e4796a4ea23c6a38c6d541   209995:
 0b30d2aba7351af22996d93c4dcbe3b8881a0f8f   209991:
 e591017a87bca4d6d337e0c1924d596af7fee034   209983:
 074cf6776d33e64e2f1d540a1edc58e7ae611586 v: v3

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

diff --git a/[refs] b/[refs]
index b81459e5b312..b7785537cd87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d9ac7fd32f600f9451ea58abdb07f7ed42e921d
+refs/heads/master: 232341ba7fa15115d40f6aa0f8dd14e96e3ad375
diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c
index f17d50047f07..f9ed0751cc12 100644
--- a/trunk/fs/cifs/dir.c
+++ b/trunk/fs/cifs/dir.c
@@ -305,8 +305,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
 	full_path = build_path_from_dentry(direntry);
 	if (full_path == NULL) {
 		rc = -ENOMEM;
-		FreeXid(xid);
-		return rc;
+		goto cifs_create_out;
 	}
 
 	if (oplockEnabled)
@@ -365,9 +364,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
 
 	buf = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL);
 	if (buf == NULL) {
-		kfree(full_path);
-		FreeXid(xid);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto cifs_create_out;
 	}
 
 	/*
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index db11fdef0e92..de748c652d11 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -242,8 +242,7 @@ int cifs_open(struct inode *inode, struct file *file)
 	full_path = build_path_from_dentry(file->f_path.dentry);
 	if (full_path == NULL) {
 		rc = -ENOMEM;
-		FreeXid(xid);
-		return rc;
+		goto out;
 	}
 
 	cFYI(1, "inode = 0x%p file flags are 0x%x for %s",