Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux

35e27445 · Linus Torvalds <[email protected]> · 2014-08-30 21:04:37 -07:00

Pull file locking bugfx from Jeff Layton:
 "Just a bugfix for a bug that crept in to v3.15.  It's in a rather rare
  error path, and I'm not aware of anyone having hit it, but it's worth
  fixing for v3.17"

* tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux:
  locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease

Commit: 35e274458c1d64dfcb725bb23a097c925dcd653d
Parents: fd5984d7 · e0b760ff

Merge commit. Changes below are compared with the first parent: fd5984d7.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/locks.c	modified	+1	−1	View file

fs/locks.c

View file

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