3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pavel Shilovsky <pshilovsky@xxxxxxxxxxx> commit e2f2886a824ff0a56da1eaa13019fde86aa89fa6 upstream. Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxxxx> Signed-off-by: Steve French <smfrench@xxxxxxxxx> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> Cc: Rui Xiang <rui.xiang@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/cifs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -882,7 +882,7 @@ cifs_push_mandatory_locks(struct cifsFil if (!buf) { mutex_unlock(&cinode->lock_mutex); FreeXid(xid); - return rc; + return -ENOMEM; } for (i = 0; i < 2; i++) { -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html