diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-04-24 07:57:48 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-05 23:18:27 +0000 |
| commit | 198b5682781b97251afd9025dbf559a77969abdd (patch) | |
| tree | bfe381f099e6986a833d93184b62bf9bcedfce69 /fs/cifs/cifsproto.h | |
| parent | ebe6aa5ac456a13213ed563863e70dd441618a97 (diff) | |
| download | blackbird-op-linux-198b5682781b97251afd9025dbf559a77969abdd.tar.gz blackbird-op-linux-198b5682781b97251afd9025dbf559a77969abdd.zip | |
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.h | 4 |
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); void cifs_proc_init(void); void cifs_proc_clean(void); -extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, +extern int cifs_negotiate_protocol(unsigned int xid, + struct cifsSesInfo *ses); +extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses, struct nls_table *nls_info); extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses); |
