hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cifs: Make devname param optional in cifs_compose_mount_options() 

If we only want to get the mount options strings, do not return the
devname.

For DFS failover, we'll be passing the DFS full path down to
cifs_mount() rather than the devname.

Signed-off-by: Paulo Alcantara <palcantara@suse.de>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Paulo Alcantara 2018-11-14 14:18:22 -02:00 committed by Steve French
parent c34fea5a63
commit d9345e0ae7
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/cifs/cifs_dfs_ref.c
View File

@ -126,7 +126,7 @@ cifs_build_devname(char *nodename, const char *prepath)
* @sb_mountdata: parent/root DFS mount options (template) * @sb_mountdata: parent/root DFS mount options (template)
* @fullpath: full path in UNC format * @fullpath: full path in UNC format
* @ref: server's referral * @ref: server's referral
* @devname: pointer for saving device name * @devname: optional pointer for saving device name
* *
* creates mount options for submount based on template options sb_mountdata * creates mount options for submount based on template options sb_mountdata
* and replacing unc,ip,prefixpath options with ones we've got form ref_unc. * and replacing unc,ip,prefixpath options with ones we've got form ref_unc.
@ -140,6 +140,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
char **devname) char **devname)
{ {
int rc; int rc;
char *name;
char *mountdata = NULL; char *mountdata = NULL;
const char *prepath = NULL; const char *prepath = NULL;
int md_len; int md_len;
@ -158,17 +159,17 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
prepath++; prepath++;
} }
*devname = cifs_build_devname(ref->node_name, prepath); name = cifs_build_devname(ref->node_name, prepath);
if (IS_ERR(*devname)) { if (IS_ERR(name)) {
rc = PTR_ERR(*devname); rc = PTR_ERR(name);
*devname = NULL; name = NULL;
goto compose_mount_options_err; goto compose_mount_options_err;
} }
rc = dns_resolve_server_name_to_ip(*devname, &srvIP); rc = dns_resolve_server_name_to_ip(name, &srvIP);
if (rc < 0) { if (rc < 0) {
cifs_dbg(FYI, "%s: Failed to resolve server part of %s to IP: %d\n", cifs_dbg(FYI, "%s: Failed to resolve server part of %s to IP: %d\n",
__func__, *devname, rc); __func__, name, rc);
goto compose_mount_options_err; goto compose_mount_options_err;
} }
@ -224,6 +225,9 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
strcat(mountdata, "ip="); strcat(mountdata, "ip=");
strcat(mountdata, srvIP); strcat(mountdata, srvIP);
if (devname)
*devname = name;
/*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/ /*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/
/*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/ /*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/
@ -234,8 +238,7 @@ compose_mount_options_out:
compose_mount_options_err: compose_mount_options_err:
kfree(mountdata); kfree(mountdata);
mountdata = ERR_PTR(rc); mountdata = ERR_PTR(rc);
kfree(*devname); kfree(name);
*devname = NULL;
goto compose_mount_options_out; goto compose_mount_options_out;
} }