Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

cifs_parse_mount_options(char *options, const char *devname,

			 struct smb_vol *vol)

{

	char *value;

	char *data;

	char *value, *data, *end;

	unsigned int  temp_len, i, j;

	char separator[2];

	short int override_uid = -1;

	if (!options)

		return 1;

	end = options + strlen(options);

	if (strncmp(options, "sep=", 4) == 0) {

		if (options[4] != 0) {

			separator[0] = options[4];

			the only illegal character in a password is null */

			if ((value[temp_len] == 0) &&

			    (value + temp_len < end) &&

			    (value[temp_len+1] == separator[0])) {

				/* reinsert comma */

				value[temp_len] = separator[0];