1 files changed, 15 insertions, 4 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0786f19d288f..92fdf9c35de2 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -224,6 +224,13 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb,
         if (backup_cred(cifs_sb))
                 create_options |= CREATE_OPEN_BACKUP_INTENT;
 
+        /* O_SYNC also has bit for O_DSYNC so following check picks up either */
+        if (f_flags & O_SYNC)
+                create_options |= CREATE_WRITE_THROUGH;
+
+        if (f_flags & O_DIRECT)
+                create_options |= CREATE_NO_BUFFER;
+
         oparms.tcon = tcon;
         oparms.cifs_sb = cifs_sb;
         oparms.desired_access = desired_access;
@@ -1102,8 +1109,10 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
         struct cifs_tcon *tcon;
         unsigned int num, max_num, max_buf;
         LOCKING_ANDX_RANGE *buf, *cur;
-        int types[] = {LOCKING_ANDX_LARGE_FILES,
-                       LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES};
+        static const int types[] = {
+                LOCKING_ANDX_LARGE_FILES,
+                LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES
+        };
         int i;
 
         xid = get_xid();
@@ -1434,8 +1443,10 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock,
                   unsigned int xid)
 {
         int rc = 0, stored_rc;
-        int types[] = {LOCKING_ANDX_LARGE_FILES,
-                       LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES};
+        static const int types[] = {
+                LOCKING_ANDX_LARGE_FILES,
+                LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES
+        };
         unsigned int i;
         unsigned int max_num, num, max_buf;
         LOCKING_ANDX_RANGE *buf, *cur;