mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
locks: inline posix_lock_file_wait and flock_lock_file_wait
They just call file_inode and then the corresponding *_inode_file_wait function. Just make them static inlines instead. Signed-off-by: Jeff Layton <[email protected]>
This commit is contained in:
parent
83bfff23e9
commit
ee296d7c57
2 changed files with 14 additions and 46 deletions
28
fs/locks.c
28
fs/locks.c
|
|
@ -1189,21 +1189,6 @@ int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)
|
|||
}
|
||||
EXPORT_SYMBOL(posix_lock_inode_wait);
|
||||
|
||||
/**
|
||||
* posix_lock_file_wait - Apply a POSIX-style lock to a file
|
||||
* @filp: The file to apply the lock to
|
||||
* @fl: The lock to be applied
|
||||
*
|
||||
* Add a POSIX style lock to a file.
|
||||
* We merge adjacent & overlapping locks whenever possible.
|
||||
* POSIX locks are sorted by owner task, then by starting address
|
||||
*/
|
||||
int posix_lock_file_wait(struct file *filp, struct file_lock *fl)
|
||||
{
|
||||
return posix_lock_inode_wait(file_inode(filp), fl);
|
||||
}
|
||||
EXPORT_SYMBOL(posix_lock_file_wait);
|
||||
|
||||
/**
|
||||
* locks_mandatory_locked - Check for an active lock
|
||||
* @file: the file to check
|
||||
|
|
@ -1889,19 +1874,6 @@ int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl)
|
|||
}
|
||||
EXPORT_SYMBOL(flock_lock_inode_wait);
|
||||
|
||||
/**
|
||||
* flock_lock_file_wait - Apply a FLOCK-style lock to a file
|
||||
* @filp: The file to apply the lock to
|
||||
* @fl: The lock to be applied
|
||||
*
|
||||
* Add a FLOCK style lock to a file.
|
||||
*/
|
||||
int flock_lock_file_wait(struct file *filp, struct file_lock *fl)
|
||||
{
|
||||
return flock_lock_inode_wait(file_inode(filp), fl);
|
||||
}
|
||||
EXPORT_SYMBOL(flock_lock_file_wait);
|
||||
|
||||
/**
|
||||
* sys_flock: - flock() system call.
|
||||
* @fd: the file descriptor to lock.
|
||||
|
|
|
|||
Loading…
Reference in a new issue