[linux-cifs-client] [PATCH 4/5] [CIFS] have cifs_get_spnego_key get the hostname from TCP_Server_Info

[Jeff Layton]

Signed-off-by: Jeff Layton <jlayton at redhat.com>
---
 fs/cifs/cifs_spnego.c |    3 ++-
 fs/cifs/cifsproto.h   |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index f9fd8aa..9cda2ed 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -68,12 +68,13 @@ struct key_type cifs_spnego_key_type = {
 
 /* get a key struct with a SPNEGO security blob, suitable for session setup */
 struct key *
-cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname)
+cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
 {
 	struct TCP_Server_Info *server = sesInfo->server;
 	char *description, *dp;
 	size_t desc_len;
 	struct key *spnego_key;
+	const char *hostname = server->hostname;
 
 	/* BB: come up with better scheme for determining length */
 	desc_len = 7 + 5 + 32 + 1 + 5 + strlen(hostname) +
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 0c55dff..3a37c6c 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -77,8 +77,7 @@ extern void header_assemble(struct smb_hdr *, char /* command */ ,
 extern int small_smb_init_no_tc(const int smb_cmd, const int wct,
 				struct cifsSesInfo *ses,
 				void **request_buf);
-extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo,
-					const char *hostname);
+extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo);
 extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
 			     const int stage,
 			     const struct nls_table *nls_cp);
-- 
1.5.3.3