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 tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index da57c9b7e8445934b86f2ae760b2e25c5df37ff3..717fbc404e6b2ac1522175758cc365a847ca0c52 100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-431,7
+431,7
@@
static int lease_init(struct file *filp, long type, struct file_lock *fl)
if (assign_type(fl, type) != 0)
return -EINVAL;
- fl->fl_owner = (fl_owner_t)
filp
;
+ fl->fl_owner = (fl_owner_t)
current->files
;
fl->fl_pid = current->tgid;
fl->fl_file = filp;