From e63d7cebae0865d72e4d67ed283d6ac536b09d7a Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Sat, 17 Nov 2007 00:01:51 +0000
Subject: [PATCH] --- yaml --- r: 74070 b: refs/heads/master c:
 f7a44eadd5a03b8455c7caab402ce96811c6903d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/cifs/cifs_spnego.c | 2 +-
 trunk/fs/cifs/cifs_spnego.h | 1 +
 trunk/fs/cifs/cifsproto.h   | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72da1fa4a1be..0b503c979ba6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2442421b176420eca7cb68c575fc221332f488d8
+refs/heads/master: f7a44eadd5a03b8455c7caab402ce96811c6903d
diff --git a/trunk/fs/cifs/cifs_spnego.c b/trunk/fs/cifs/cifs_spnego.c
index c466b56e0283..1529d2b12e9c 100644
--- a/trunk/fs/cifs/cifs_spnego.c
+++ b/trunk/fs/cifs/cifs_spnego.c
@@ -67,7 +67,7 @@ struct key_type cifs_spnego_key_type = {
 };
 
 #define MAX_VER_STR_LEN   9 /* length of longest version string e.g.
-				strlen(";ver=0xFF) */
+				strlen(";ver=0xFF") */
 #define MAX_MECH_STR_LEN 13 /* length of longest security mechanism name, eg
 			       in future could have strlen(";sec=ntlmsspi") */
 #define MAX_IPV6_ADDR_LEN 42 /* eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */
diff --git a/trunk/fs/cifs/cifs_spnego.h b/trunk/fs/cifs/cifs_spnego.h
index f443f3b35134..05a34b17a1ab 100644
--- a/trunk/fs/cifs/cifs_spnego.h
+++ b/trunk/fs/cifs/cifs_spnego.h
@@ -41,6 +41,7 @@ struct cifs_spnego_msg {
 
 #ifdef __KERNEL__
 extern struct key_type cifs_spnego_key_type;
+extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo);
 #endif /* KERNEL */
 
 #endif /* _CIFS_SPNEGO_H */
diff --git a/trunk/fs/cifs/cifsproto.h b/trunk/fs/cifs/cifsproto.h
index 3748104ddedb..8350eec49663 100644
--- a/trunk/fs/cifs/cifsproto.h
+++ b/trunk/fs/cifs/cifsproto.h
@@ -77,7 +77,6 @@ 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);
 extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
 			     const int stage,
 			     const struct nls_table *nls_cp);