CIFS: Move protocol specific negotiate code to ops struct

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 844b77c2bc9c..8a4150573cf8 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -192,6 +192,10 @@ struct smb_version_operations {
         /* process transaction2 response */
         bool (*check_trans2)(struct mid_q_entry *, struct TCP_Server_Info *,
                              char *, int);
+        /* check if we need to negotiate */
+        bool (*need_neg)(struct TCP_Server_Info *);
+        /* negotiate to the server */
+        int (*negotiate)(const unsigned int, struct cifs_ses *);
 };
 
 struct smb_version_values {
@@ -324,7 +328,7 @@ struct TCP_Server_Info {
         struct mutex srv_mutex;
         struct task_struct *tsk;
         char server_GUID[16];
-        char sec_mode;
+        __u16 sec_mode;
         bool session_estab; /* mark when very first sess is established */
         u16 dialect; /* dialect index that server chose */
         enum securityEnum secType;
@@ -459,7 +463,7 @@ struct cifs_ses {
         char *serverOS;         /* name of operating system underlying server */
         char *serverNOS;        /* name of network operating system of server */
         char *serverDomain;     /* security realm of server */
-        int Suid;               /* remote smb uid  */
+        __u64 Suid;             /* remote smb uid  */
         uid_t linux_uid;        /* overriding owner of files on the mount */
         uid_t cred_uid;         /* owner of credentials */
         int capabilities;