4 small smb3 fixes to the new mount API
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAmAm8mYACgkQiiy9cAdy T1FDMgwArdtgQtRL9hSOINBl19/OM9GSLszUtI/EctfZGgnGoNysIq4/pIvv7uqE egVohlVwJI4niGguU7AABj5vrthLsAbmzKi+e2N6kAcYtzpXeLvjkXVfyq/Bld66 oe7sYWMjH1TFEc64gejW7nYcxOsg93HQtAvNyyoAS3SlOOWsl2LI/AQiw3BXXVBo Jb1AkfpdBGglUW7esYVZUyVwCI/ZzYVEA0YTCpaGX+EIfdCWXm3ArNPP7E9gHOLb 3HUbNP6W5QKwgYL1tPX3s7AFEtj0+PxuREgB6mSTFOkWRRfZJUTma1AEfa9MUWGA KOnQKiIzIsmaOQGP/BumcrPr/7kgeqYEFZ2exNT8kVw6ETEHP1+A4j61KZI0mduz rgnQx21gPzVcDo0tfO8SjGSt3vzuRA+vkyZO4eB/nmTqJ4YVqX+E6E4vophKOUk2 ELqk0fUlX3uspqocZCor5nrLA0EadNV6P/LfFiRyGUTt+tOcOeYmyAdK7dWY1JTf wsd20mCY =vJKS -----END PGP SIGNATURE----- Merge tag '5.11-rc7-smb3-github' of git://github.com/smfrench/smb3-kernel Pull cifs fixes from Steve French: "Four small smb3 fixes to the new mount API (including a particularly important one for DFS links). These were found in testing this week of additional DFS scenarios, and a user testing of an apache container problem" * tag '5.11-rc7-smb3-github' of git://github.com/smfrench/smb3-kernel: cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath. cifs: In the new mount api we get the full devname as source= cifs: do not disable noperm if multiuser mount option is not provided cifs: fix dfs-links
This commit is contained in:
commit
7989807dc0
|
@ -469,7 +469,7 @@ cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb)
|
||||||
static int cifs_show_devname(struct seq_file *m, struct dentry *root)
|
static int cifs_show_devname(struct seq_file *m, struct dentry *root)
|
||||||
{
|
{
|
||||||
struct cifs_sb_info *cifs_sb = CIFS_SB(root->d_sb);
|
struct cifs_sb_info *cifs_sb = CIFS_SB(root->d_sb);
|
||||||
char *devname = kstrdup(cifs_sb->ctx->UNC, GFP_KERNEL);
|
char *devname = kstrdup(cifs_sb->ctx->source, GFP_KERNEL);
|
||||||
|
|
||||||
if (devname == NULL)
|
if (devname == NULL)
|
||||||
seq_puts(m, "none");
|
seq_puts(m, "none");
|
||||||
|
|
|
@ -2756,6 +2756,7 @@ int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb)
|
||||||
cifs_sb->prepath = kstrdup(ctx->prepath, GFP_KERNEL);
|
cifs_sb->prepath = kstrdup(ctx->prepath, GFP_KERNEL);
|
||||||
if (cifs_sb->prepath == NULL)
|
if (cifs_sb->prepath == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_USE_PREFIX_PATH;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2983,6 +2984,14 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses,
|
||||||
rc = PTR_ERR(mdata);
|
rc = PTR_ERR(mdata);
|
||||||
mdata = NULL;
|
mdata = NULL;
|
||||||
} else {
|
} else {
|
||||||
|
/*
|
||||||
|
* We can not clear out the whole structure since we
|
||||||
|
* no longer have an explicit function to parse
|
||||||
|
* a mount-string. Instead we need to clear out the
|
||||||
|
* individual fields that are no longer valid.
|
||||||
|
*/
|
||||||
|
kfree(ctx->prepath);
|
||||||
|
ctx->prepath = NULL;
|
||||||
rc = cifs_setup_volume_info(ctx, mdata, fake_devname);
|
rc = cifs_setup_volume_info(ctx, mdata, fake_devname);
|
||||||
}
|
}
|
||||||
kfree(fake_devname);
|
kfree(fake_devname);
|
||||||
|
|
|
@ -148,7 +148,6 @@ const struct fs_parameter_spec smb3_fs_parameters[] = {
|
||||||
|
|
||||||
/* Mount options which take string value */
|
/* Mount options which take string value */
|
||||||
fsparam_string("source", Opt_source),
|
fsparam_string("source", Opt_source),
|
||||||
fsparam_string("unc", Opt_source),
|
|
||||||
fsparam_string("user", Opt_user),
|
fsparam_string("user", Opt_user),
|
||||||
fsparam_string("username", Opt_user),
|
fsparam_string("username", Opt_user),
|
||||||
fsparam_string("pass", Opt_pass),
|
fsparam_string("pass", Opt_pass),
|
||||||
|
@ -178,6 +177,11 @@ const struct fs_parameter_spec smb3_fs_parameters[] = {
|
||||||
fsparam_flag_no("auto", Opt_ignore),
|
fsparam_flag_no("auto", Opt_ignore),
|
||||||
fsparam_string("cred", Opt_ignore),
|
fsparam_string("cred", Opt_ignore),
|
||||||
fsparam_string("credentials", Opt_ignore),
|
fsparam_string("credentials", Opt_ignore),
|
||||||
|
/*
|
||||||
|
* UNC and prefixpath is now extracted from Opt_source
|
||||||
|
* in the new mount API so we can just ignore them going forward.
|
||||||
|
*/
|
||||||
|
fsparam_string("unc", Opt_ignore),
|
||||||
fsparam_string("prefixpath", Opt_ignore),
|
fsparam_string("prefixpath", Opt_ignore),
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
@ -313,6 +317,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx
|
||||||
new_ctx->password = NULL;
|
new_ctx->password = NULL;
|
||||||
new_ctx->domainname = NULL;
|
new_ctx->domainname = NULL;
|
||||||
new_ctx->UNC = NULL;
|
new_ctx->UNC = NULL;
|
||||||
|
new_ctx->source = NULL;
|
||||||
new_ctx->iocharset = NULL;
|
new_ctx->iocharset = NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -323,6 +328,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx
|
||||||
DUP_CTX_STR(username);
|
DUP_CTX_STR(username);
|
||||||
DUP_CTX_STR(password);
|
DUP_CTX_STR(password);
|
||||||
DUP_CTX_STR(UNC);
|
DUP_CTX_STR(UNC);
|
||||||
|
DUP_CTX_STR(source);
|
||||||
DUP_CTX_STR(domainname);
|
DUP_CTX_STR(domainname);
|
||||||
DUP_CTX_STR(nodename);
|
DUP_CTX_STR(nodename);
|
||||||
DUP_CTX_STR(iocharset);
|
DUP_CTX_STR(iocharset);
|
||||||
|
@ -732,6 +738,7 @@ static int smb3_reconfigure(struct fs_context *fc)
|
||||||
* just use what we already have in cifs_sb->ctx.
|
* just use what we already have in cifs_sb->ctx.
|
||||||
*/
|
*/
|
||||||
STEAL_STRING(cifs_sb, ctx, UNC);
|
STEAL_STRING(cifs_sb, ctx, UNC);
|
||||||
|
STEAL_STRING(cifs_sb, ctx, source);
|
||||||
STEAL_STRING(cifs_sb, ctx, username);
|
STEAL_STRING(cifs_sb, ctx, username);
|
||||||
STEAL_STRING(cifs_sb, ctx, password);
|
STEAL_STRING(cifs_sb, ctx, password);
|
||||||
STEAL_STRING(cifs_sb, ctx, domainname);
|
STEAL_STRING(cifs_sb, ctx, domainname);
|
||||||
|
@ -974,6 +981,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
|
||||||
cifs_dbg(VFS, "Unknown error parsing devname\n");
|
cifs_dbg(VFS, "Unknown error parsing devname\n");
|
||||||
goto cifs_parse_mount_err;
|
goto cifs_parse_mount_err;
|
||||||
}
|
}
|
||||||
|
ctx->source = kstrdup(param->string, GFP_KERNEL);
|
||||||
|
if (ctx->source == NULL) {
|
||||||
|
cifs_dbg(VFS, "OOM when copying UNC string\n");
|
||||||
|
goto cifs_parse_mount_err;
|
||||||
|
}
|
||||||
fc->source = kstrdup(param->string, GFP_KERNEL);
|
fc->source = kstrdup(param->string, GFP_KERNEL);
|
||||||
if (fc->source == NULL) {
|
if (fc->source == NULL) {
|
||||||
cifs_dbg(VFS, "OOM when copying UNC string\n");
|
cifs_dbg(VFS, "OOM when copying UNC string\n");
|
||||||
|
@ -1396,6 +1408,8 @@ smb3_cleanup_fs_context_contents(struct smb3_fs_context *ctx)
|
||||||
ctx->password = NULL;
|
ctx->password = NULL;
|
||||||
kfree(ctx->UNC);
|
kfree(ctx->UNC);
|
||||||
ctx->UNC = NULL;
|
ctx->UNC = NULL;
|
||||||
|
kfree(ctx->source);
|
||||||
|
ctx->source = NULL;
|
||||||
kfree(ctx->domainname);
|
kfree(ctx->domainname);
|
||||||
ctx->domainname = NULL;
|
ctx->domainname = NULL;
|
||||||
kfree(ctx->nodename);
|
kfree(ctx->nodename);
|
||||||
|
@ -1533,8 +1547,8 @@ void smb3_update_mnt_flags(struct cifs_sb_info *cifs_sb)
|
||||||
cifs_sb->mnt_cifs_flags |= (CIFS_MOUNT_MULTIUSER |
|
cifs_sb->mnt_cifs_flags |= (CIFS_MOUNT_MULTIUSER |
|
||||||
CIFS_MOUNT_NO_PERM);
|
CIFS_MOUNT_NO_PERM);
|
||||||
else
|
else
|
||||||
cifs_sb->mnt_cifs_flags &= ~(CIFS_MOUNT_MULTIUSER |
|
cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_MULTIUSER;
|
||||||
CIFS_MOUNT_NO_PERM);
|
|
||||||
|
|
||||||
if (ctx->strict_io)
|
if (ctx->strict_io)
|
||||||
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_STRICT_IO;
|
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_STRICT_IO;
|
||||||
|
|
|
@ -159,6 +159,7 @@ struct smb3_fs_context {
|
||||||
char *username;
|
char *username;
|
||||||
char *password;
|
char *password;
|
||||||
char *domainname;
|
char *domainname;
|
||||||
|
char *source;
|
||||||
char *UNC;
|
char *UNC;
|
||||||
char *nodename;
|
char *nodename;
|
||||||
char *iocharset; /* local code page for mapping to and from Unicode */
|
char *iocharset; /* local code page for mapping to and from Unicode */
|
||||||
|
|
Loading…
Reference in a new issue