Commit 35e27445 authored Aug 30, 2014 by Linus Torvalds

linux

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

parents fd5984d7 e0b760ff

fs/locks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message