aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsproto.h
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-04-24 07:57:48 -0400
committerSteve French <sfrench@us.ibm.com>2010-05-05 19:18:27 -0400
commit198b5682781b97251afd9025dbf559a77969abdd (patch)
treebfe381f099e6986a833d93184b62bf9bcedfce69 /fs/cifs/cifsproto.h
parentebe6aa5ac456a13213ed563863e70dd441618a97 (diff)
cifs: break negotiate protocol calls out of cifs_setup_session
So that we can reasonably set up the secType based on both the NegotiateProtocol response and the parsed mount options. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r--fs/cifs/cifsproto.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 8e9214275e42..6fa808ec7e36 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -138,7 +138,9 @@ extern void cifs_dfs_release_automount_timer(void);
138void cifs_proc_init(void); 138void cifs_proc_init(void);
139void cifs_proc_clean(void); 139void cifs_proc_clean(void);
140 140
141extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 141extern int cifs_negotiate_protocol(unsigned int xid,
142 struct cifsSesInfo *ses);
143extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses,
142 struct nls_table *nls_info); 144 struct nls_table *nls_info);
143extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses); 145extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses);
144 146