The following changes since commit c8d6637d0497d62093dbba0694c7b3a80b79bfe1: Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (2014-08-10 21:31:58 -0700) are available in the git repository at: git://git.samba.org/jlayton/linux.git tags/locks-v3.17-2 for you to fetch changes up to 2ece173e4715031c031de9114491eee80a69cf68: locks: update Locking documentation to clarify fl_release_private behavior (2014-08-14 10:08:20 -0400) ---------------------------------------------------------------- File locking related bugfixes for v3.17 (pile #2) Hi Linus! 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". ---------------------------------------------------------------- Jeff Layton (6): locks: show delegations as "DELEG" in /proc/locks locks: don't call locks_release_private from locks_copy_lock locks: don't reuse file_lock in __posix_lock_file locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock locks: update Locking documentation to clarify fl_release_private behavior Documentation/filesystems/Locking | 6 +++++- fs/locks.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 62 insertions(+), 30 deletions(-) -- Jeff Layton <jlayton@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html