diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/locks.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/locks.c b/fs/locks.c index fb32d6218e21..909eab8fb1d0 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -154,7 +154,7 @@ static struct file_lock *locks_alloc_lock(void) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | /* Free a lock which is not in use. */ | 156 | /* Free a lock which is not in use. */ |
157 | static inline void locks_free_lock(struct file_lock *fl) | 157 | static void locks_free_lock(struct file_lock *fl) |
158 | { | 158 | { |
159 | if (fl == NULL) { | 159 | if (fl == NULL) { |
160 | BUG(); | 160 | BUG(); |
@@ -475,8 +475,7 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2) | |||
475 | /* | 475 | /* |
476 | * Check whether two locks have the same owner. | 476 | * Check whether two locks have the same owner. |
477 | */ | 477 | */ |
478 | static inline int | 478 | static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) |
479 | posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) | ||
480 | { | 479 | { |
481 | if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner) | 480 | if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner) |
482 | return fl2->fl_lmops == fl1->fl_lmops && | 481 | return fl2->fl_lmops == fl1->fl_lmops && |
@@ -487,7 +486,7 @@ posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) | |||
487 | /* Remove waiter from blocker's block list. | 486 | /* Remove waiter from blocker's block list. |
488 | * When blocker ends up pointing to itself then the list is empty. | 487 | * When blocker ends up pointing to itself then the list is empty. |
489 | */ | 488 | */ |
490 | static inline void __locks_delete_block(struct file_lock *waiter) | 489 | static void __locks_delete_block(struct file_lock *waiter) |
491 | { | 490 | { |
492 | list_del_init(&waiter->fl_block); | 491 | list_del_init(&waiter->fl_block); |
493 | list_del_init(&waiter->fl_link); | 492 | list_del_init(&waiter->fl_link); |