Update 3.2 sources from stable (v3.2.32)

e0bc5ebd · Pavel Shilovsky · 86262279 · e0bc5ebd · e0bc5ebd
Commit e0bc5ebd authored Oct 30, 2012 by Pavel Shilovsky
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cifs_unicode.c sources/3.2/cifs_unicode.c +1 -1

file.c sources/3.2/file.c +1 -1

No files found.
--- a/sources/3.2/cifs_unicode.c
+++ b/sources/3.2/cifs_unicode.c
@@ -327,6 +327,6 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
 	}

 ctoUCS_out:
-	return i;
+	return j;
 }

--- a/sources/3.2/file.c
+++ b/sources/3.2/file.c
@@ -888,7 +888,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++) {