From: Jeff Layton <jlayton@primarydata.com>
Date: Fri, 22 Aug 2014 13:58:22 +0000 (-0400)
Subject: locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
X-Git-Tag: v3.16.4~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e05f7a049389792dd6decdc3861413a3bcd8f051;p=thirdparty%2Fkernel%2Fstable.git

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

commit e0b760ff71be168d4e623f7c3612e98902ab93e9 upstream.

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.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/locks.c b/fs/locks.c
index 717fbc404e6b2..be530f9b13cea 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1595,7 +1595,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);