git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[pandora-kernel.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
cb66fb0
..
bb08857
100644
(file)
--- 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);