diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2015-10-22 13:38:15 -0400 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-10-22 14:57:42 -0400 |
| commit | 616fb38fa7a9599293e05ae1fa9acfaf73922434 (patch) | |
| tree | 468cc10d44736b22d843a87c31c8a306d9e605cd /fs/locks.c | |
| parent | 4f6563677ae833baad8003e14353241bc25da4fc (diff) | |
| download | lwn-616fb38fa7a9599293e05ae1fa9acfaf73922434.tar.gz lwn-616fb38fa7a9599293e05ae1fa9acfaf73922434.zip | |
locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait
All callers use locks_lock_inode_wait() instead.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/locks.c b/fs/locks.c index 4667f8226747..0d2b3267e2a3 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1171,10 +1171,9 @@ EXPORT_SYMBOL(posix_lock_file); * @inode: inode of file to which lock request should be applied * @fl: The lock to be applied * - * Variant of posix_lock_file_wait that does not take a filp, and so can be - * used after the filp has already been torn down. + * Apply a POSIX style lock request to an inode. */ -int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) +static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) { int error; might_sleep (); @@ -1191,7 +1190,6 @@ int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) } return error; } -EXPORT_SYMBOL(posix_lock_inode_wait); /** * locks_mandatory_locked - Check for an active lock @@ -1862,7 +1860,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) * * Apply a FLOCK style lock request to an inode. */ -int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) +static int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) { int error; might_sleep(); @@ -1879,7 +1877,6 @@ int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) } return error; } -EXPORT_SYMBOL(flock_lock_inode_wait); /** * locks_lock_inode_wait - Apply a lock to an inode |