1 files changed, 25 insertions, 2 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 939e2f76b959..bc09c998631f 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1934,6 +1934,27 @@ CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
 }
 
 int
+CIFSSMBFlush(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
+{
+        int rc = 0;
+        FLUSH_REQ *pSMB = NULL;
+        cFYI(1, ("In CIFSSMBFlush"));
+
+        rc = small_smb_init(SMB_COM_FLUSH, 1, tcon, (void **) &pSMB);
+        if (rc)
+                return rc;
+
+        pSMB->FileID = (__u16) smb_file_id;
+        pSMB->ByteCount = 0;
+        rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
+        cifs_stats_inc(&tcon->num_flushes);
+        if (rc)
+                cERROR(1, ("Send error in Flush = %d", rc));
+
+        return rc;
+}
+
+int
 CIFSSMBRename(const int xid, struct cifsTconInfo *tcon,
               const char *fromName, const char *toName,
               const struct nls_table *nls_codepage, int remap)
@@ -2356,8 +2377,10 @@ winCreateHardLinkRetry:
                                      PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-                pSMB->OldFileName[name_len] = 0;        /* pad */
-                pSMB->OldFileName[name_len + 1] = 0x04;
+
+                /* protocol specifies ASCII buffer format (0x04) for unicode */
+                pSMB->OldFileName[name_len] = 0x04;
+                pSMB->OldFileName[name_len + 1] = 0x00; /* pad */
                 name_len2 =
                     cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
                                      toName, PATH_MAX, nls_codepage, remap);