git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ocfs2: Use xs->bucket to set xattr value outside
[safe/jmp/linux-2.6]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
46a2e12
..
ec3deea
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1564,7
+1564,7
@@
EXPORT_SYMBOL(flock_lock_file_wait);
* %LOCK_MAND can be combined with %LOCK_READ or %LOCK_WRITE to allow other
* processes read and write access respectively.
*/
* %LOCK_MAND can be combined with %LOCK_READ or %LOCK_WRITE to allow other
* processes read and write access respectively.
*/
-
asmlinkage long sys_flock(unsigned int fd, unsigned int
cmd)
+
SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int,
cmd)
{
struct file *filp;
struct file_lock *lock;
{
struct file *filp;
struct file_lock *lock;