Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Allow reset of file to ATTR_NORMAL when archive bit not set
  [CIFS] Do not negotiate new POSIX_PATH_OPERATIONS_CAP yet
  [CIFS] reset mode when client notices that ATTR_READONLY is no longer set

diff --combined fs/cifs/cifspdu.h
index 3af7624,e894545..4d8948e
--- 1/fs/cifs/cifspdu.h
--- 2/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@@ -220,7 -220,7 +220,7 @@@
   */
  #define CIFS_NO_HANDLE        0xFFFF
  
 -#define NO_CHANGE_64          0xFFFFFFFFFFFFFFFFULL
 +#define NO_CHANGE_64          cpu_to_le64(0xFFFFFFFFFFFFFFFFULL)
  #define NO_CHANGE_32          0xFFFFFFFFUL
  
  /* IPC$ in ASCII */
@@@ -1887,7 -1887,13 +1887,13 @@@ typedef struct 
                                                      calls including posix open
                                                      and posix unlink */ 
  #ifdef CONFIG_CIFS_POSIX
- #define CIFS_UNIX_CAP_MASK              0x0000003b
+ /* Can not set pathnames cap yet until we send new posix create SMB since
+    otherwise server can treat such handles opened with older ntcreatex
+    (by a new client which knows how to send posix path ops)
+    as non-posix handles (can affect write behavior with byte range locks.
+    We can add back in POSIX_PATH_OPS cap when Posix Create/Mkdir finished */
+ /* #define CIFS_UNIX_CAP_MASK              0x0000003b */
+ #define CIFS_UNIX_CAP_MASK              0x0000001b 
  #else 
  #define CIFS_UNIX_CAP_MASK              0x00000013
  #endif /* CONFIG_CIFS_POSIX */