Merge branch 'from-linus' into upstream

[linux.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index c881a1a29f0b14d4e85f7fd172af2858f778597a..e2b4ce1dad6680cc54d8af516e7cf876533361fd 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -84,6 +84,8 @@ static inline int cifs_get_disposition(unsigned int flags)
                return FILE_OVERWRITE_IF;
        else if ((flags & O_CREAT) == O_CREAT)
                return FILE_OPEN_IF;
+       else if ((flags & O_TRUNC) == O_TRUNC)
+               return FILE_OVERWRITE;
        else
                return FILE_OPEN;
 }
@@ -905,8 +907,8 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
                                        break;
                        }
                        if(experimEnabled || (pTcon->ses->server &&
-                               (pTcon->ses->server->secMode & 
-                               (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)
+                               ((pTcon->ses->server->secMode & 
+                               (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                                == 0))) {
                                struct kvec iov[2];
                                unsigned int len;