Commit e0bc5ebd authored by Pavel Shilovsky's avatar Pavel Shilovsky

Update 3.2 sources from stable (v3.2.32)

parent 86262279
...@@ -327,6 +327,6 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen, ...@@ -327,6 +327,6 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
} }
ctoUCS_out: ctoUCS_out:
return i; return j;
} }
...@@ -888,7 +888,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) ...@@ -888,7 +888,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
if (!buf) { if (!buf) {
mutex_unlock(&cinode->lock_mutex); mutex_unlock(&cinode->lock_mutex);
FreeXid(xid); FreeXid(xid);
return rc; return -ENOMEM;
} }
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment