--- fs/cifs/connect.c

+++ fs/cifs/connect.c

@@ -799,7 +799,8 @@ static int

cifs_parse_mount_options(char *options, const char *devname,

struct smb_vol *vol)

{

- char *value, *data, *end;

+ char *value;

+ char *data;

unsigned int temp_len, i, j;

char separator[2];

short int override_uid = -1;

@@ -842,7 +843,6 @@ cifs_parse_mount_options(char *options,

if (!options)

return 1;

- end = options + strlen(options);

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

if (options[4] != 0) {

separator[0] = options[4];

@@ -907,7 +907,6 @@ cifs_parse_mount_options(char *options,

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];

@@ -2231,11 +2230,6 @@ is_path_accessible(int xid, struct cifsT

0 /* not legacy */, cifs_sb->local_nls,

cifs_sb->mnt_cifs_flags &

CIFS_MOUNT_MAP_SPECIAL_CHR);

-

- if (rc == -EOPNOTSUPP || rc == -EINVAL)

- rc = SMBQueryInformation(xid, tcon, full_path, pfile_info,

- cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &

- CIFS_MOUNT_MAP_SPECIAL_CHR);

kfree(pfile_info);

return rc;

}

@@ -2538,7 +2532,7 @@ try_mount_again:

remote_path_check:

/* check if a whole path (including prepath) is not remote */

- if (!rc && tcon) {

+ if (!rc && cifs_sb->prepathlen && tcon) {

/* build_path_to_root works only when we have a valid tcon */

full_path = cifs_build_path_to_root(cifs_sb);

if (full_path == NULL) {