From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Aug 2014 22:34:28 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: firefly_0821_release~176^2~3337
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f01bfc977e26d010bbd6eccdd687340548f191b3;p=firefly-linux-kernel-4.4.55.git

Merge tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client fixes from Trond Myklebust:
 "Highlights:

   - more fixes for read/write codepath regressions
     * sleeping while holding the inode lock
     * stricter enforcement of page contiguity when coalescing requests
     * fix up error handling in the page coalescing code

   - don't busy wait on SIGKILL in the file locking code"

* tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: Don't busy-wait on SIGKILL in __nfs_iocounter_wait
  nfs: can_coalesce_requests must enforce contiguity
  nfs: disallow duplicate pages in pgio page vectors
  nfs: don't sleep with inode lock in lock_and_join_requests
  nfs: fix error handling in lock_and_join_requests
  nfs: use blocking page_group_lock in add_request
  nfs: fix nonblocking calls to nfs_page_group_lock
  nfs: change nfs_page_group_lock argument
---

f01bfc977e26d010bbd6eccdd687340548f191b3