Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc

[cascardo/linux.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index cb66fb0..bb08857 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1619,7 +1619,7 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp
        smp_mb();
        error = check_conflicting_open(dentry, arg);
        if (error)
-               locks_unlink_lock(flp);
+               locks_unlink_lock(before);
 out:
        if (is_deleg)
                mutex_unlock(&inode->i_mutex);