mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-29 19:27:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-08-30 21:04:37 -07:00
parent fd5984d7c8 e0b760ff71
commit 35e274458c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/locks.c
View File

@@ -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);