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] cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled
  [CIFS] Fix hang in mount when negprot causes server to kill tcp session
  disable most mode changes on non-unix/non-cifsacl mounts
  [CIFS] Correct incorrect obscure open flag
  [CIFS] warn if both dynperm and cifsacl mount options specified
  silently ignore ownership changes unless unix extensions are enabled or we're faking uid changes
  [CIFS] remove trailing whitespace
  when creating new inodes, use file_mode/dir_mode exclusively on mount without unix extensions
  on non-posix shares, clear write bits in mode when ATTR_READONLY is set
  [CIFS] remove unused variables

diff --combined fs/cifs/cifssmb.c
index fb655b4593c635dc190d750ae182252757251a6e,174bf8aca237a2bee6af2c63d80573abd2d103dc..4511b708f0f312d57677e2947276c2063f142446
--- 1/fs/cifs/cifssmb.c
--- 2/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@@ -1728,7 -1728,7 +1728,7 @@@ CIFSSMBLock(const int xid, struct cifsT
  {
        int rc = 0;
        LOCK_REQ *pSMB = NULL;
-       LOCK_RSP *pSMBr = NULL;
+ /*    LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */
        int bytes_returned;
        int timeout = 0;
        __u16 count;
@@@ -1739,8 -1739,6 +1739,6 @@@
        if (rc)
                return rc;
  
-       pSMBr = (LOCK_RSP *)pSMB; /* BB removeme BB */
- 
        if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {
                timeout = CIFS_ASYNC_OP; /* no response expected */
                pSMB->Timeout = 0;
@@@ -1774,7 -1772,7 +1772,7 @@@
  
        if (waitFlag) {
                rc = SendReceiveBlockingLock(xid, tcon, (struct smb_hdr *) pSMB,
-                       (struct smb_hdr *) pSMBr, &bytes_returned);
+                       (struct smb_hdr *) pSMB, &bytes_returned);
                cifs_small_buf_release(pSMB);
        } else {
                rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB,
@@@ -3927,9 -3925,9 +3925,9 @@@ parse_DFS_referrals(TRANSACTION2_GET_DF
        }
  
        ref = (struct dfs_referral_level_3 *) &(pSMBr->referrals);
 -      if (ref->VersionNumber != 3) {
 +      if (ref->VersionNumber != cpu_to_le16(3)) {
                cERROR(1, ("Referrals of V%d version are not supported,"
 -                      "should be V3", ref->VersionNumber));
 +                      "should be V3", le16_to_cpu(ref->VersionNumber)));
                rc = -EINVAL;
                goto parse_DFS_referrals_exit;
        }
@@@ -3977,7 -3975,7 +3975,7 @@@
                if (rc)
                        goto parse_DFS_referrals_exit;
  
 -              ref += ref->Size;
 +              ref += le16_to_cpu(ref->Size);
        }
  
  parse_DFS_referrals_exit: