projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20ba5d7
)
switch flock to fget_light/fput_light
author
Al Viro
<viro@zeniv.linux.org.uk>
Sat, 21 Apr 2012 22:46:53 +0000
(18:46 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Wed, 30 May 2012 03:28:31 +0000
(23:28 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/locks.c
patch
|
blob
|
history
diff --git
a/fs/locks.c
b/fs/locks.c
index
4f441e4
..
814c51d
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1636,12
+1636,13
@@
EXPORT_SYMBOL(flock_lock_file_wait);
SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
{
struct file *filp;
+ int fput_needed;
struct file_lock *lock;
int can_sleep, unlock;
int error;
error = -EBADF;
- filp = fget
(f
d);
+ filp = fget
_light(fd, &fput_neede
d);
if (!filp)
goto out;
@@
-1674,7
+1675,7
@@
SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
locks_free_lock(lock);
out_putf:
- fput
(filp
);
+ fput
_light(filp, fput_needed
);
out:
return error;
}