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: add cruid= mount option
cifs: cFYI the entire error code in map_smb_to_linux_error

+4 -2
+2
fs/cifs/connect.c
··· 1113 1113 } else if (!strnicmp(data, "uid", 3) && value && *value) { 1114 1114 vol->linux_uid = simple_strtoul(value, &value, 0); 1115 1115 uid_specified = true; 1116 + } else if (!strnicmp(data, "cruid", 5) && value && *value) { 1117 + vol->cred_uid = simple_strtoul(value, &value, 0); 1116 1118 } else if (!strnicmp(data, "forceuid", 8)) { 1117 1119 override_uid = 1; 1118 1120 } else if (!strnicmp(data, "noforceuid", 10)) {
+2 -2
fs/cifs/netmisc.c
··· 899 899 } 900 900 /* else ERRHRD class errors or junk - return EIO */ 901 901 902 - cFYI(1, "Mapping smb error code %d to POSIX err %d", 903 - smberrcode, rc); 902 + cFYI(1, "Mapping smb error code 0x%x to POSIX err %d", 903 + le32_to_cpu(smb->Status.CifsError), rc); 904 904 905 905 /* generic corrective action e.g. reconnect SMB session on 906 906 * ERRbaduid could be added */