From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Dec 2008 20:37:14 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.29-rc1~582
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=54a696bd07c14d3b1192d03ce7269bc59b45209a;p=linux-2.6-omap-h63xx.git

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: (31 commits)
  [CIFS] Remove redundant test
  [CIFS] make sure that DFS pathnames are properly formed
  Remove an already-checked error condition in SendReceiveBlockingLock
  Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
  Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
  [CIFS] Streamline SendReceive[2] by using "goto out:" in an error condition
  Slightly streamline SendReceive[2]
  Check the return value of cifs_sign_smb[2]
  [CIFS] Cleanup: Move the check for too large R/W requests
  [CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary "else" branch
  Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
  [CIFS] In SendReceive, move consistency check out of the mutexed region
  cifs: store password in tcon
  cifs: have calc_lanman_hash take more granular args
  cifs: zero out session password before freeing it
  cifs: fix wait_for_response to time out sleeping processes correctly
  [CIFS] Can not mount with prefixpath if root directory of share is inaccessible
  [CIFS] various minor cleanups pointed out by checkpatch script
  [CIFS] fix typo
  [CIFS] remove sparse warning
  ...

Fix trivial conflict in fs/cifs/cifs_fs_sb.h due to comment changes for
the CIFS_MOUNT_xyz bit definitions between cifs updates and security
updates.
---

54a696bd07c14d3b1192d03ce7269bc59b45209a
diff --cc fs/cifs/cifs_fs_sb.h
index 1e7b87497f2,5edd5cc415a..c4c306f7b06
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@@ -19,8 -19,8 +19,8 @@@
  #define _CIFS_FS_SB_H
  
  #define CIFS_MOUNT_NO_PERM      1 /* do not do client vfs_perm check */
 -#define CIFS_MOUNT_SET_UID      2 /* set current->euid in create etc. */
 +#define CIFS_MOUNT_SET_UID      2 /* set current's euid in create etc. */
- #define CIFS_MOUNT_SERVER_INUM  4 /* inode numbers from uniqueid from server */
+ #define CIFS_MOUNT_SERVER_INUM  4 /* inode numbers from uniqueid from server  */
  #define CIFS_MOUNT_DIRECT_IO    8 /* do not write nor read through page cache */
  #define CIFS_MOUNT_NO_XATTR     0x10  /* if set - disable xattr support       */
  #define CIFS_MOUNT_MAP_SPECIAL_CHR 0x20 /* remap illegal chars in filenames   */