Merge tag 'v4.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

[karo-tx-linux.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 90b652ad306f126941258d7d8448f45172d67a4e..365c82e1b3a9a602057e65edc9b857c6adce6b76 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1107,6 +1107,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                }
                locks_copy_lock(new_fl, request);
                locks_insert_lock_ctx(new_fl, &fl->fl_list);
+               fl = new_fl;
                new_fl = NULL;
        }
        if (right) {