mirror of
https://github.com/S3NEO/android_kernel_samsung_msm8226.git
synced 2024-09-21 12:00:44 +00:00
cifs: fix expand_dfs_referral
Regression introduced in commit 724d9f1cfb
.
Prior to that, expand_dfs_referral would regenerate the mount data string
and then call cifs_parse_mount_options to re-parse it (klunky, but it
worked). The above commit moved cifs_parse_mount_options out of cifs_mount,
so the re-parsing of the new mount options no longer occurred. Fix it by
making expand_dfs_referral re-parse the mount options.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
20547490c1
commit
b9bce2e9f9
|
@ -65,6 +65,8 @@ static int ip_connect(struct TCP_Server_Info *server);
|
||||||
static int generic_ip_connect(struct TCP_Server_Info *server);
|
static int generic_ip_connect(struct TCP_Server_Info *server);
|
||||||
static void tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink);
|
static void tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink);
|
||||||
static void cifs_prune_tlinks(struct work_struct *work);
|
static void cifs_prune_tlinks(struct work_struct *work);
|
||||||
|
static int cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
|
||||||
|
const char *devname);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* cifs tcp session reconnection
|
* cifs tcp session reconnection
|
||||||
|
@ -2830,12 +2832,9 @@ is_path_accessible(int xid, struct cifs_tcon *tcon,
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
cifs_cleanup_volume_info(struct smb_vol *volume_info)
|
cleanup_volume_info_contents(struct smb_vol *volume_info)
|
||||||
{
|
{
|
||||||
if (!volume_info)
|
|
||||||
return;
|
|
||||||
|
|
||||||
kfree(volume_info->username);
|
kfree(volume_info->username);
|
||||||
kzfree(volume_info->password);
|
kzfree(volume_info->password);
|
||||||
kfree(volume_info->UNC);
|
kfree(volume_info->UNC);
|
||||||
|
@ -2843,10 +2842,18 @@ cifs_cleanup_volume_info(struct smb_vol *volume_info)
|
||||||
kfree(volume_info->domainname);
|
kfree(volume_info->domainname);
|
||||||
kfree(volume_info->iocharset);
|
kfree(volume_info->iocharset);
|
||||||
kfree(volume_info->prepath);
|
kfree(volume_info->prepath);
|
||||||
kfree(volume_info);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
cifs_cleanup_volume_info(struct smb_vol *volume_info)
|
||||||
|
{
|
||||||
|
if (!volume_info)
|
||||||
|
return;
|
||||||
|
cleanup_volume_info_contents(volume_info);
|
||||||
|
kfree(volume_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_CIFS_DFS_UPCALL
|
#ifdef CONFIG_CIFS_DFS_UPCALL
|
||||||
/* build_path_to_root returns full path to root when
|
/* build_path_to_root returns full path to root when
|
||||||
* we do not have an exiting connection (tcon) */
|
* we do not have an exiting connection (tcon) */
|
||||||
|
@ -2915,15 +2922,18 @@ expand_dfs_referral(int xid, struct cifs_ses *pSesInfo,
|
||||||
&fake_devname);
|
&fake_devname);
|
||||||
|
|
||||||
free_dfs_info_array(referrals, num_referrals);
|
free_dfs_info_array(referrals, num_referrals);
|
||||||
kfree(fake_devname);
|
|
||||||
|
|
||||||
if (cifs_sb->mountdata != NULL)
|
|
||||||
kfree(cifs_sb->mountdata);
|
|
||||||
|
|
||||||
if (IS_ERR(mdata)) {
|
if (IS_ERR(mdata)) {
|
||||||
rc = PTR_ERR(mdata);
|
rc = PTR_ERR(mdata);
|
||||||
mdata = NULL;
|
mdata = NULL;
|
||||||
|
} else {
|
||||||
|
cleanup_volume_info_contents(volume_info);
|
||||||
|
memset(volume_info, '\0', sizeof(*volume_info));
|
||||||
|
rc = cifs_setup_volume_info(volume_info, mdata,
|
||||||
|
fake_devname);
|
||||||
}
|
}
|
||||||
|
kfree(fake_devname);
|
||||||
|
kfree(cifs_sb->mountdata);
|
||||||
cifs_sb->mountdata = mdata;
|
cifs_sb->mountdata = mdata;
|
||||||
}
|
}
|
||||||
kfree(full_path);
|
kfree(full_path);
|
||||||
|
|
Loading…
Reference in a new issue