From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Aug 2014 14:58:47 +0000 (-0600)
Subject: Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux
X-Git-Tag: v4.9.8~5859
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53b95d6341c142a02538e41bdf1405ef8888bf8b;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux

Pull file locking bugfixes from Jeff Layton:
 "Most of these patches are to fix a long-standing regression that crept
  in when the BKL was removed from the file-locking code.  The code was
  converted to use a conventional spinlock, but some fl_release_private
  ops can block and you can end up sleeping inside the lock.

  There's also a patch to make /proc/locks show delegations as 'DELEG'"

* tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux:
  locks: update Locking documentation to clarify fl_release_private behavior
  locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock
  locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped
  locks: don't reuse file_lock in __posix_lock_file
  locks: don't call locks_release_private from locks_copy_lock
  locks: show delegations as "DELEG" in /proc/locks
---

53b95d6341c142a02538e41bdf1405ef8888bf8b