CIFS: Separate protocol-specific code from transport routines

that lets us use this functions for SMB2.

Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>

1 files changed, 10 insertions, 11 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 70aac35c398f..a7ed01cd0242 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -696,7 +696,7 @@ CIFSSMBTDis(const int xid, struct cifs_tcon *tcon)
         if (rc)
                 return rc;
 
-        rc = SendReceiveNoRsp(xid, tcon->ses, smb_buffer, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *)smb_buffer, 0);
         if (rc)
                 cFYI(1, "Tree disconnect failed %d", rc);
 
@@ -792,7 +792,7 @@ CIFSSMBLogoff(const int xid, struct cifs_ses *ses)
         pSMB->hdr.Uid = ses->Suid;
 
         pSMB->AndXCommand = 0xFF;
-        rc = SendReceiveNoRsp(xid, ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, ses, (char *) pSMB, 0);
 session_already_dead:
         mutex_unlock(&ses->session_mutex);
 
@@ -2420,8 +2420,7 @@ CIFSSMBLock(const int xid, struct cifs_tcon *tcon,
                         (struct smb_hdr *) pSMB, &bytes_returned);
                 cifs_small_buf_release(pSMB);
         } else {
-                rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB,
-                                      timeout);
+                rc = SendReceiveNoRsp(xid, tcon->ses, (char *)pSMB, timeout);
                 /* SMB buffer freed by function above */
         }
         cifs_stats_inc(&tcon->num_locks);
@@ -2588,7 +2587,7 @@ CIFSSMBClose(const int xid, struct cifs_tcon *tcon, int smb_file_id)
         pSMB->FileID = (__u16) smb_file_id;
         pSMB->LastWriteTime = 0xFFFFFFFF;
         pSMB->ByteCount = 0;
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         cifs_stats_inc(&tcon->num_closes);
         if (rc) {
                 if (rc != -EINTR) {
@@ -2617,7 +2616,7 @@ CIFSSMBFlush(const int xid, struct cifs_tcon *tcon, int smb_file_id)
 
         pSMB->FileID = (__u16) smb_file_id;
         pSMB->ByteCount = 0;
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         cifs_stats_inc(&tcon->num_flushes);
         if (rc)
                 cERROR(1, "Send error in Flush = %d", rc);
@@ -4625,7 +4624,7 @@ CIFSFindClose(const int xid, struct cifs_tcon *tcon,
 
         pSMB->FileID = searchHandle;
         pSMB->ByteCount = 0;
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         if (rc)
                 cERROR(1, "Send error in FindClose = %d", rc);
 
@@ -5646,7 +5645,7 @@ CIFSSMBSetFileSize(const int xid, struct cifs_tcon *tcon, __u64 size,
         pSMB->Reserved4 = 0;
         inc_rfc1001_len(pSMB, byte_count);
         pSMB->ByteCount = cpu_to_le16(byte_count);
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         if (rc) {
                 cFYI(1, "Send error in SetFileInfo (SetFileSize) = %d", rc);
         }
@@ -5715,7 +5714,7 @@ CIFSSMBSetFileInfo(const int xid, struct cifs_tcon *tcon,
         inc_rfc1001_len(pSMB, byte_count);
         pSMB->ByteCount = cpu_to_le16(byte_count);
         memcpy(data_offset, data, sizeof(FILE_BASIC_INFO));
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         if (rc)
                 cFYI(1, "Send error in Set Time (SetFileInfo) = %d", rc);
 
@@ -5774,7 +5773,7 @@ CIFSSMBSetFileDisposition(const int xid, struct cifs_tcon *tcon,
         inc_rfc1001_len(pSMB, byte_count);
         pSMB->ByteCount = cpu_to_le16(byte_count);
         *data_offset = delete_file ? 1 : 0;
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         if (rc)
                 cFYI(1, "Send error in SetFileDisposition = %d", rc);
 
@@ -6006,7 +6005,7 @@ CIFSSMBUnixSetFileInfo(const int xid, struct cifs_tcon *tcon,
 
         cifs_fill_unix_set_info(data_offset, args);
 
-        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
         if (rc)
                 cFYI(1, "Send error in Set Time (SetFileInfo) = %d", rc);