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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
21dfadf
..
e0b6a80
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1514,7
+1514,7
@@
int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
goto out_unlock;
}
- error =
f_setown(filp, current->pid
, 0);
+ error =
__f_setown(filp, task_pid(current), PIDTYPE_PID
, 0);
out_unlock:
unlock_kernel();
return error;