From 891e51793fec91e7ee65fe5d4f17ae1c1951408f Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 14 Jul 2005 18:29:02 -0500
Subject: [PATCH] --- yaml --- r: 12011 b: refs/heads/master c:
 f4cfd69cf349dd27e00d5cf804b57aee04e059c2 h: refs/heads/master i:   12009:
 30601efc47d0e0543b2ae7a8d2cbe36af1661c8f   12007:
 44a50fa754fe8e9da0b8ffcc6512129f34eef1c8 v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/CHANGES | 6 ++++++
 trunk/fs/cifs/misc.c  | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b518b1eb57b2..44eae430f576 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7245c2ccf14cde2023273c1ec246732d96e2c27
+refs/heads/master: f4cfd69cf349dd27e00d5cf804b57aee04e059c2
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index dab4774ee7bb..3196d4c4eed3 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -1,3 +1,9 @@
+Version 1.35
+------------
+Add writepage performance improvements.  Fix path name conversions
+for long filenames on mounts which were done with "mapchars" mount option
+specified.
+
 Version 1.34
 ------------
 Fix error mapping of the TOO_MANY_LINKS (hardlinks) case.
diff --git a/trunk/fs/cifs/misc.c b/trunk/fs/cifs/misc.c
index 072b4ee8c53e..20ae4153f791 100644
--- a/trunk/fs/cifs/misc.c
+++ b/trunk/fs/cifs/misc.c
@@ -611,6 +611,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
 		src_char = source[i];
 		switch (src_char) {
 			case 0:
+				target[j] = 0;
 				goto ctoUCS_out;
 			case ':':
 				target[j] = cpu_to_le16(UNI_COLON);