Merge tag '4.21-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git] / fs / cifs / file.c
index c23bf9da93d2bf4891bdaff01137f87a6a73f8b9..5e405164394a1c0287d8a6b7e348fe1292bccec3 100644 (file)
@@ -1103,10 +1103,10 @@ try_again:
        rc = posix_lock_file(file, flock, NULL);
        up_write(&cinode->lock_sem);
        if (rc == FILE_LOCK_DEFERRED) {
-               rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);
+               rc = wait_event_interruptible(flock->fl_wait, !flock->fl_blocker);
                if (!rc)
                        goto try_again;
-               posix_unblock_lock(flock);
+               locks_delete_block(flock);
        }
        return rc;
 }