diff --git a/[refs] b/[refs]
index 4b6ae59b6d4d..5a63b3703991 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfae0acd26aebbbafde038617892df728194f4ae
+refs/heads/master: f12f98dba6ea1517cd7fbb912208893b9c014c15
diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c
index f84062f9a985..f5618f8cc462 100644
--- a/trunk/fs/cifs/readdir.c
+++ b/trunk/fs/cifs/readdir.c
@@ -666,6 +666,7 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,
 					   min(len, max_len), nlt,
 					   cifs_sb->mnt_cifs_flags &
 						CIFS_MOUNT_MAP_SPECIAL_CHR);
+		pqst->len -= nls_nullsize(nlt);
 	} else {
 		pqst->name = filename;
 		pqst->len = len;