|
@@ -154,7 +154,7 @@ static struct file_lock *locks_alloc_lock(void)
|
|
}
|
|
}
|
|
|
|
|
|
/* Free a lock which is not in use. */
|
|
/* Free a lock which is not in use. */
|
|
-static inline void locks_free_lock(struct file_lock *fl)
|
|
|
|
|
|
+static void locks_free_lock(struct file_lock *fl)
|
|
{
|
|
{
|
|
if (fl == NULL) {
|
|
if (fl == NULL) {
|
|
BUG();
|
|
BUG();
|
|
@@ -475,8 +475,7 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2)
|
|
/*
|
|
/*
|
|
* Check whether two locks have the same owner.
|
|
* Check whether two locks have the same owner.
|
|
*/
|
|
*/
|
|
-static inline int
|
|
|
|
-posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
|
|
|
|
|
|
+static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
|
|
{
|
|
{
|
|
if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner)
|
|
if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner)
|
|
return fl2->fl_lmops == fl1->fl_lmops &&
|
|
return fl2->fl_lmops == fl1->fl_lmops &&
|
|
@@ -487,7 +486,7 @@ posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
|
|
/* Remove waiter from blocker's block list.
|
|
/* Remove waiter from blocker's block list.
|
|
* When blocker ends up pointing to itself then the list is empty.
|
|
* When blocker ends up pointing to itself then the list is empty.
|
|
*/
|
|
*/
|
|
-static inline void __locks_delete_block(struct file_lock *waiter)
|
|
|
|
|
|
+static void __locks_delete_block(struct file_lock *waiter)
|
|
{
|
|
{
|
|
list_del_init(&waiter->fl_block);
|
|
list_del_init(&waiter->fl_block);
|
|
list_del_init(&waiter->fl_link);
|
|
list_del_init(&waiter->fl_link);
|