From: Jeff Layton <jlayton@primarydata.com>
Date: Tue, 9 Sep 2014 20:00:51 +0000 (-0400)
Subject: locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
X-Git-Tag: locks-v3.18-1~25
X-Git-Url: http://git.samba.org/?p=jlayton%2Flinux.git;a=commitdiff_plain;h=f39b913cee67e401ad697578baca0ba34830209b

locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease

The argument to locks_unlink_lock can't be just any pointer to a
pointer. It must be a pointer to the fl_next field in the previous
lock in the list.

Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/fs/locks.c b/fs/locks.c
index cb66fb05ad4a..bb08857f90b5 100644
--- 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);