From: Pavel Shilovsky <pshilovsky@etersoft.ru>
Date: Wed, 29 Aug 2012 17:13:38 +0000 (+0400)
Subject: CIFS: Fix error handling in cifs_push_mandatory_locks
X-Git-Tag: v3.4.92~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47532a2912f1840809a23b733d2a5bdf09a906ee;p=thirdparty%2Fkernel%2Fstable.git

CIFS: Fix error handling in cifs_push_mandatory_locks

commit e2f2886a824ff0a56da1eaa13019fde86aa89fa6 upstream.

Signed-off-by: Pavel Shilovsky <pshilovsky@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Rui Xiang <rui.xiang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9ace37521510c..cab00544c7ed8 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -882,7 +882,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
 	if (!buf) {
 		mutex_unlock(&cinode->lock_mutex);
 		FreeXid(xid);
-		return rc;
+		return -ENOMEM;
 	}
 
 	for (i = 0; i < 2; i++) {