[GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[Jeff Layton]

Hi Linus,

The following changes since commit 1fa185ebcbcefdc5229c783450c9f0439a69f0c1:

  Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris (2015-02-15 18:02:02 -0800)

are available in the git repository at:

  git://git.samba.org/jlayton/linux.git tags/locks-v3.20-2

for you to fetch changes up to 2e2f756f81edd7c3ba6ed384385ae1d6491652eb:

  locks: fix list insertion when lock is split in two (2015-02-17 17:08:23 -0500)

----------------------------------------------------------------
File locking related fixes for v3.20 (pile #2)

A small set of patches to fix problems with the recent file locking
changes that we discussed earlier this week.

----------------------------------------------------------------
Jeff Layton (4):
      Revert "locks: keep a count of locks on the flctx lists"
      locks: only remove leases associated with the file being closed
      locks: remove conditional lock release in middle of flock_lock_file
      locks: fix list insertion when lock is split in two

 fs/ceph/locks.c    |  9 +++++++--
 fs/cifs/file.c     | 14 ++++++++++----
 fs/locks.c         | 59 +++++++++++++++++++----------------------------------------
 include/linux/fs.h |  3 ---
 4 files changed, 36 insertions(+), 49 deletions(-)

-- 
Jeff Layton <jlayton@xxxxxxxxxxxxxxx>

Attachment: pgpXdwYOYK3T7.pgp
Description: OpenPGP digital signature