mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
cifs: don't create a temp nls in cifs_setup_ipc
just use the one that is already available in ctx Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
387ec58f33
commit
6fd4ea88b5
1 changed files with 1 additions and 6 deletions
|
@ -1478,7 +1478,6 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb3_fs_context *ctx)
|
|||
{
|
||||
int rc = 0, xid;
|
||||
struct cifs_tcon *tcon;
|
||||
struct nls_table *nls_codepage;
|
||||
char unc[SERVER_NAME_LENGTH + sizeof("//x/IPC$")] = {0};
|
||||
bool seal = false;
|
||||
struct TCP_Server_Info *server = ses->server;
|
||||
|
@ -1503,14 +1502,11 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb3_fs_context *ctx)
|
|||
|
||||
scnprintf(unc, sizeof(unc), "\\\\%s\\IPC$", server->hostname);
|
||||
|
||||
/* cannot fail */
|
||||
nls_codepage = load_nls_default();
|
||||
|
||||
xid = get_xid();
|
||||
tcon->ses = ses;
|
||||
tcon->ipc = true;
|
||||
tcon->seal = seal;
|
||||
rc = server->ops->tree_connect(xid, ses, unc, tcon, nls_codepage);
|
||||
rc = server->ops->tree_connect(xid, ses, unc, tcon, ctx->local_nls);
|
||||
free_xid(xid);
|
||||
|
||||
if (rc) {
|
||||
|
@ -1523,7 +1519,6 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb3_fs_context *ctx)
|
|||
|
||||
ses->tcon_ipc = tcon;
|
||||
out:
|
||||
unload_nls(nls_codepage);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue