projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index cb66fb05ad4a97e6ed9e975dc631c09b42d7fc03..bb08857f90b56cb2b51a77b3f69acfef33a8fd9c 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);