aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-30 21:04:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-30 21:04:37 -0700
commit35e274458c1d64dfcb725bb23a097c925dcd653d (patch)
treeb0d265bc448d5923b1221f46d130d44456032e93
parentfd5984d7c8e8e249aca0c515817ab1e7dee1502c (diff)
parente0b760ff71be168d4e623f7c3612e98902ab93e9 (diff)
downloadlinux-stericsson-35e274458c1d64dfcb725bb23a097c925dcd653d.tar.gz
Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/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
-rw-r--r--fs/locks.c2
1 files changed, 1 insertions, 1 deletions
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);