Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

locks: drop the unused filp argument to posix_unblock_lock

Browse source 
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Jeff Layton 2013-06-21 08:58:09 -04:00 committed by Al Viro
parent da53be12bb
commit f891a29f46
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/lockd/svclock.c
View file

@ -276,7 +276,7 @@ static int nlmsvc_unlink_block(struct nlm_block *block)
dprintk("lockd: unlinking block %p...\n", block); dprintk("lockd: unlinking block %p...\n", block);
/* Remove block from list */ /* Remove block from list */
status = posix_unblock_lock(block->b_file->f_file, &block->b_call->a_args.lock.fl); status = posix_unblock_lock(&block->b_call->a_args.lock.fl);
nlmsvc_remove_block(block); nlmsvc_remove_block(block);
return status; return status;
} }

4
fs/locks.c
View file

@ -2099,13 +2099,12 @@ void locks_remove_flock(struct file *filp)
/** /**
* posix_unblock_lock - stop waiting for a file lock * posix_unblock_lock - stop waiting for a file lock
* @filp: how the file was opened
* @waiter: the lock which was waiting * @waiter: the lock which was waiting
* *
* lockd needs to block waiting for locks. * lockd needs to block waiting for locks.
*/ */
int int
posix_unblock_lock(struct file *filp, struct file_lock *waiter) posix_unblock_lock(struct file_lock *waiter)
{ {
int status = 0; int status = 0;
@ -2117,7 +2116,6 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter)
unlock_flocks(); unlock_flocks();
return status; return status;
} }
EXPORT_SYMBOL(posix_unblock_lock); EXPORT_SYMBOL(posix_unblock_lock);
/** /**

5
include/linux/fs.h
View file

@ -994,7 +994,7 @@ extern void locks_release_private(struct file_lock *);
extern void posix_test_lock(struct file *, struct file_lock *); extern void posix_test_lock(struct file *, struct file_lock *);
extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *); extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
extern int posix_lock_file_wait(struct file *, struct file_lock *); extern int posix_lock_file_wait(struct file *, struct file_lock *);
extern int posix_unblock_lock(struct file *, struct file_lock *); extern int posix_unblock_lock(struct file_lock *);
extern int vfs_test_lock(struct file *, struct file_lock *); extern int vfs_test_lock(struct file *, struct file_lock *);
extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *); extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *);
extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl); extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
@ -1084,8 +1084,7 @@ static inline int posix_lock_file_wait(struct file *filp, struct file_lock *fl)
return -ENOLCK; return -ENOLCK;
} }
static inline int posix_unblock_lock(struct file *filp, static inline int posix_unblock_lock(struct file_lock *waiter)
struct file_lock *waiter)
{ {
return -ENOENT; return -ENOENT;
} }