diff --git a/[refs] b/[refs]
index 84672cd36ab4..698643cd6f94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08775834c412c48f3539ef7ed073fff58e3cf419
+refs/heads/master: 55aa2e097dd5f0546972fc2607d7094181967ce2
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 5e59723c02bd..e2b4ce1dad66 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/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;
 }