diff options
| -rw-r--r-- | fs/smb/client/cifsproto.h | 3 | ||||
| -rw-r--r-- | fs/smb/client/cifssmb.c | 2 | ||||
| -rw-r--r-- | fs/smb/client/connect.c | 11 | ||||
| -rw-r--r-- | fs/smb/client/sess.c | 2 | ||||
| -rw-r--r-- | fs/smb/client/smb2pdu.c | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h index 46b7ac2885f2..7b9eca22281f 100644 --- a/fs/smb/client/cifsproto.h +++ b/fs/smb/client/cifsproto.h @@ -290,8 +290,7 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon); int cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses, struct TCP_Server_Info *server); int cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, - struct TCP_Server_Info *server, - struct nls_table *nls_info); + struct TCP_Server_Info *server); int cifs_enable_signing(struct TCP_Server_Info *server, bool mnt_sign_required); diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index e1ef04c93fab..06438d3fff90 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -163,7 +163,7 @@ again: return -EHOSTDOWN; goto again; } - rc = cifs_setup_session(0, ses, server, ses->local_nls); + rc = cifs_setup_session(0, ses, server); if ((rc == -EACCES) || (rc == -EHOSTDOWN) || (rc == -EKEYREVOKED)) { /* * Try alternate password for next reconnect if an alternate diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c index 067330fa0069..fba926347682 100644 --- a/fs/smb/client/connect.c +++ b/fs/smb/client/connect.c @@ -2403,8 +2403,7 @@ retry_old_session: return ERR_PTR(rc); } - rc = cifs_setup_session(xid, ses, server, - ctx->local_nls); + rc = cifs_setup_session(xid, ses, server); if (rc) { if (((rc == -EACCES) || (rc == -EKEYEXPIRED) || (rc == -EKEYREVOKED)) && !retries && ses->password2) { @@ -2521,7 +2520,7 @@ retry_new_session: mutex_lock(&ses->session_mutex); rc = cifs_negotiate_protocol(xid, ses, server); if (!rc) - rc = cifs_setup_session(xid, ses, server, ctx->local_nls); + rc = cifs_setup_session(xid, ses, server); mutex_unlock(&ses->session_mutex); /* each channel uses a different signing key */ @@ -4093,10 +4092,8 @@ retry: return rc; } -int -cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, - struct TCP_Server_Info *server, - struct nls_table *nls_info) +int cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, + struct TCP_Server_Info *server) { int rc = 0; struct TCP_Server_Info *pserver = SERVER_IS_CHAN(server) ? server->primary_server : server; diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index f86a7a8cd1f7..c1fc90726e2d 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -620,7 +620,7 @@ cifs_ses_add_channel(struct cifs_ses *ses, rc = cifs_negotiate_protocol(xid, ses, chan->server); if (!rc) - rc = cifs_setup_session(xid, ses, chan->server, ses->local_nls); + rc = cifs_setup_session(xid, ses, chan->server); mutex_unlock(&ses->session_mutex); diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index cb72735a4553..41ca08538316 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -395,7 +395,7 @@ again: } } - rc = cifs_setup_session(0, ses, server, ses->local_nls); + rc = cifs_setup_session(0, ses, server); if ((rc == -EACCES) || (rc == -EKEYEXPIRED) || (rc == -EKEYREVOKED)) { /* * Try alternate password for next reconnect (key rotation |