Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 16:28:11 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 16:28:11 +0000 (09:28 -0700)
commita9866ba47c3e7b7665b5f08fa6ef684f3285c939
tree1d3977c467148892532f683ac5fcc4534c672b5d
parent331ae4962b975246944ea039697a8f1cadce42bb
parentcd60042cc1392e79410dc8de9e9c1abb38a29e57
Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: always update the inode cache with the results from a FIND_*
  cifs: when CONFIG_HIGHMEM is set, serialize the read/write kmaps
  cifs: on CONFIG_HIGHMEM machines, limit the rsize/wsize to the kmap space
  Initialise mid_q_entry before putting it on the pending queue