]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
CIFS: Fix error handling in cifs_push_mandatory_locks
authorPavel Shilovsky <pshilovsky@etersoft.ru>
Wed, 29 Aug 2012 17:13:38 +0000 (21:13 +0400)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 19 Sep 2012 14:04:44 +0000 (15:04 +0100)
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>
fs/cifs/file.c

index 0bb785f6608374b18ee305ef0f8ff1d635abce20..51574d499db8f7733e17f45e8daef8bfe5c958e0 100644 (file)
@@ -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++) {