diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-06-21 14:58:09 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 10:57:37 +0200 |
| commit | f891a29f46553a384edbaa0f6ac446b1d03bccac (patch) | |
| tree | 5b8a0083237e6b3632011b19a89c9d1df99b2912 /fs | |
| parent | Don't pass inode to ->d_hash() and ->d_compare() (diff) | |
| download | linux-f891a29f46553a384edbaa0f6ac446b1d03bccac.tar.xz linux-f891a29f46553a384edbaa0f6ac446b1d03bccac.zip | |
locks: drop the unused filp argument to posix_unblock_lock
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/svclock.c | 2 | ||||
| -rw-r--r-- | fs/locks.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index e703318c41df..a469098682c4 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -276,7 +276,7 @@ static int nlmsvc_unlink_block(struct nlm_block *block) dprintk("lockd: unlinking block %p...\n", block); /* 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); return status; } diff --git a/fs/locks.c b/fs/locks.c index cb424a4fed71..72fb2b722211 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2099,13 +2099,12 @@ void locks_remove_flock(struct file *filp) /** * posix_unblock_lock - stop waiting for a file lock - * @filp: how the file was opened * @waiter: the lock which was waiting * * lockd needs to block waiting for locks. */ int -posix_unblock_lock(struct file *filp, struct file_lock *waiter) +posix_unblock_lock(struct file_lock *waiter) { int status = 0; @@ -2117,7 +2116,6 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter) unlock_flocks(); return status; } - EXPORT_SYMBOL(posix_unblock_lock); /** |