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>

1 files changed, 10 insertions, 4 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 8fe1f7a21b3e..a94b3e673182 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1129,7 +1129,7 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
         struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
         struct file_lock *flock;
         struct file_lock_context *flctx = inode->i_flctx;
-        unsigned int i;
+        unsigned int count = 0, i;
         int rc = 0, xid, type;
         struct list_head locks_to_send, *el;
         struct lock_to_push *lck, *tmp;
@@ -1140,14 +1140,20 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
         if (!flctx)
                 goto out;
 
+        spin_lock(&flctx->flc_lock);
+        list_for_each(el, &flctx->flc_posix) {
+                count++;
+        }
+        spin_unlock(&flctx->flc_lock);
+
         INIT_LIST_HEAD(&locks_to_send);
 
         /*
-         * Allocating flc_posix_cnt locks is enough because no FL_POSIX locks
-         * can be added to the list while we are holding cinode->lock_sem that
+         * Allocating count locks is enough because no FL_POSIX locks can be
+         * added to the list while we are holding cinode->lock_sem that
          * protects locking operations of this inode.
          */
-        for (i = 0; i < flctx->flc_posix_cnt; i++) {
+        for (i = 0; i < count; i++) {
                 lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL);
                 if (!lck) {
                         rc = -ENOMEM;