Commit 1a47f7a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ab2020f2 bd763319

fs/cifs/connect.c

+2 −0
Original line number Diff line number Diff line
@@ -1113,6 +1113,8 @@ cifs_parse_mount_options(char *options, const char *devname, 
		} else if (!strnicmp(data, "uid", 3) && value && *value) {

			vol->linux_uid = simple_strtoul(value, &value, 0);

			uid_specified = true;

		} else if (!strnicmp(data, "cruid", 5) && value && *value) {

			vol->cred_uid = simple_strtoul(value, &value, 0);

		} else if (!strnicmp(data, "forceuid", 8)) {

			override_uid = 1;

		} else if (!strnicmp(data, "noforceuid", 10)) {

fs/cifs/netmisc.c

+2 −2
Original line number Diff line number Diff line
@@ -899,8 +899,8 @@ map_smb_to_linux_error(struct smb_hdr *smb, int logErr) 
	}

	/* else ERRHRD class errors or junk  - return EIO */



	cFYI(1, "Mapping smb error code %d to POSIX err %d",

		 smberrcode, rc);

	cFYI(1, "Mapping smb error code 0x%x to POSIX err %d",

		 le32_to_cpu(smb->Status.CifsError), rc);



	/* generic corrective action e.g. reconnect SMB session on

	 * ERRbaduid could be added */