git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[sfrench/cifs-2.6.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index 365c82e1b3a9a602057e65edc9b857c6adce6b76..f1bad681fc1ca3df14eda4be6542088425e901d2 100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1665,7
+1665,8
@@
generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
}
if (my_fl != NULL) {
- error = lease->fl_lmops->lm_change(my_fl, arg, &dispose);
+ lease = my_fl;
+ error = lease->fl_lmops->lm_change(lease, arg, &dispose);
if (error)
goto out;
goto out_setup;