Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: fix cifsConvertToUCS() for the mapchars case
cifs: add fallback in is_path_accessible for old servers
+11
-8
+6
-8
fs/cifs/cifs_unicode.c
+6
-8
fs/cifs/cifs_unicode.c
···
277
277
278
278
for (i = 0, j = 0; i < srclen; j++) {
279
279
src_char = source[i];
280
+
charlen = 1;
280
281
switch (src_char) {
281
282
case 0:
282
283
put_unaligned(0, &target[j]);
···
317
316
dst_char = cpu_to_le16(0x003f);
318
317
charlen = 1;
319
318
}
320
-
/*
321
-
* character may take more than one byte in the source
322
-
* string, but will take exactly two bytes in the
323
-
* target string
324
-
*/
325
-
i += charlen;
326
-
continue;
327
319
}
320
+
/*
321
+
* character may take more than one byte in the source string,
322
+
* but will take exactly two bytes in the target string
323
+
*/
324
+
i += charlen;
328
325
put_unaligned(dst_char, &target[j]);
329
-
i++; /* move to next char in source string */
330
326
}
331
327
332
328
ctoUCS_out:
+5
fs/cifs/connect.c
+5
fs/cifs/connect.c
···
2673
2673
0 /* not legacy */, cifs_sb->local_nls,
2674
2674
cifs_sb->mnt_cifs_flags &
2675
2675
CIFS_MOUNT_MAP_SPECIAL_CHR);
2676
+
2677
+
if (rc == -EOPNOTSUPP || rc == -EINVAL)
2678
+
rc = SMBQueryInformation(xid, tcon, full_path, pfile_info,
2679
+
cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
2680
+
CIFS_MOUNT_MAP_SPECIAL_CHR);
2676
2681
kfree(pfile_info);
2677
2682
return rc;
2678
2683
}