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"

1 files changed, 0 insertions, 3 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 447932aed1e1..b4d71b5e1ff2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -968,9 +968,6 @@ struct file_lock_context {
         struct list_head        flc_flock;
         struct list_head        flc_posix;
         struct list_head        flc_lease;
-        int                     flc_flock_cnt;
-        int                     flc_posix_cnt;
-        int                     flc_lease_cnt;
 };
 
 /* The following constant reflects the upper bound of the file/locking space */