summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 21:21:47 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 21:21:47 +0300
commitb2b89ebfc0f0287e20516a5443d93af309b800cf (patch)
treed3c1e02fbc3ed33ebc00b88d6265a3cd2f5d1015 /include
parenteaa0eda56223815cd9dc1225f715ff673ae77198 (diff)
parent2e2f756f81edd7c3ba6ed384385ae1d6491652eb (diff)
downloadlinux-b2b89ebfc0f0287e20516a5443d93af309b800cf.tar.xz
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"
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h3
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 */