This patchset should fix the problems that Linus spotted in the flock code yesterday, as well as another bug in the lease code that I spotted while patching those up. It'll be interesting to see if this fixes the problem that Kirill reported yesterday. If these looks acceptable, then I can send another pull request or you can just use the one below. ------------------------[snip]---------------------------------- 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 c07ef59a2e7f768ec39fb9c93419e27d09698e22: locks: only remove leases associated with the file being closed (2015-02-17 06:59:42 -0500) Jeff Layton (4): Revert "locks: keep a count of locks on the flctx lists" locks: remove conditional lock release in middle of flock_lock_file locks: when upgrading, don't remove old flock lock until replacing with new one locks: only remove leases associated with the file being closed fs/ceph/locks.c | 11 ++++++-- fs/cifs/file.c | 14 +++++++--- fs/locks.c | 78 ++++++++++++++++++++++++------------------------------ include/linux/fs.h | 3 --- 4 files changed, 53 insertions(+), 53 deletions(-) -- 2.1.0 -- 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