summaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorJeff Layton2015-02-16 20:32:03 +0100
committerJeff Layton2015-02-16 20:32:03 +0100
commite084c1bd40926938ff8d26af3bde34396dd4d06d (patch)
tree5d4dd8e3eaf5c46430670d4858084230128f3bbd /include/linux/fs.h
parentMerge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/je... (diff)
downloadkernel-qcow2-linux-e084c1bd40926938ff8d26af3bde34396dd4d06d.tar.gz
kernel-qcow2-linux-e084c1bd40926938ff8d26af3bde34396dd4d06d.tar.xz
kernel-qcow2-linux-e084c1bd40926938ff8d26af3bde34396dd4d06d.zip
Revert "locks: keep a count of locks on the flctx lists"
This reverts commit 9bd0f45b7037fcfa8b575c7e27d0431d6e6dc3bb. Linus rightly pointed out that I failed to initialize the counters when adding them, so they don't work as expected. Just revert this patch for now. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'include/linux/fs.h')
-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 e49f10cc8a73..a5a303e8a33c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -969,9 +969,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 */