1 files changed, 10 insertions, 10 deletions

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index d1998b6086ef..147aa22c3c3a 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -295,7 +295,7 @@ static int wait_for_free_request(struct TCP_Server_Info *server,
         return 0;
 }
 
-static int allocate_mid(struct cifsSesInfo *ses, struct smb_hdr *in_buf,
+static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
                         struct mid_q_entry **ppmidQ)
 {
         if (ses->server->tcpStatus == CifsExiting) {
@@ -355,7 +355,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov,
                 return rc;
 
         /* enable signing if server requires it */
-        if (server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+        if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                 hdr->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
         mutex_lock(&server->srv_mutex);
@@ -409,7 +409,7 @@ out_err:
  *
  */
 int
-SendReceiveNoRsp(const unsigned int xid, struct cifsSesInfo *ses,
+SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses,
                 struct smb_hdr *in_buf, int flags)
 {
         int rc;
@@ -504,7 +504,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,
                  min_t(u32, 92, be32_to_cpu(mid->resp_buf->smb_buf_length)));
 
         /* convert the length into a more usable form */
-        if (server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {
+        if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {
                 /* FIXME: add code to kill session */
                 if (cifs_verify_signature(mid->resp_buf, server,
                                           mid->sequence_number + 1) != 0)
@@ -516,7 +516,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,
 }
 
 int
-SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
+SendReceive2(const unsigned int xid, struct cifs_ses *ses,
              struct kvec *iov, int n_vec, int *pRespBufType /* ret */,
              const int flags)
 {
@@ -645,7 +645,7 @@ out:
 }
 
 int
-SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
+SendReceive(const unsigned int xid, struct cifs_ses *ses,
             struct smb_hdr *in_buf, struct smb_hdr *out_buf,
             int *pbytes_returned, const int long_op)
 {
@@ -761,12 +761,12 @@ out:
    blocking lock to return. */
 
 static int
-send_lock_cancel(const unsigned int xid, struct cifsTconInfo *tcon,
+send_lock_cancel(const unsigned int xid, struct cifs_tcon *tcon,
                         struct smb_hdr *in_buf,
                         struct smb_hdr *out_buf)
 {
         int bytes_returned;
-        struct cifsSesInfo *ses = tcon->ses;
+        struct cifs_ses *ses = tcon->ses;
         LOCK_REQ *pSMB = (LOCK_REQ *)in_buf;
 
         /* We just modify the current in_buf to change
@@ -783,14 +783,14 @@ send_lock_cancel(const unsigned int xid, struct cifsTconInfo *tcon,
 }
 
 int
-SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon,
+SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
             struct smb_hdr *in_buf, struct smb_hdr *out_buf,
             int *pbytes_returned)
 {
         int rc = 0;
         int rstart = 0;
         struct mid_q_entry *midQ;
-        struct cifsSesInfo *ses;
+        struct cifs_ses *ses;
 
         if (tcon == NULL || tcon->ses == NULL) {
                 cERROR(1, "Null smb session");