Linus Torvalds b2b89ebfc0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux ...

Pull file locking fixes from Jeff Layton:
 "A small set of patches to fix problems with the recent file locking
  changes that we discussed earlier this week"
"

* tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux:
  locks: fix list insertion when lock is split in two
  locks: remove conditional lock release in middle of flock_lock_file
  locks: only remove leases associated with the file being closed
  Revert "locks: keep a count of locks on the flctx lists"

2015-02-18 10:21:47 -08:00

96 KiB

Raw Blame History

View Raw