Commit 33443c42 authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds

[PATCH] tiny: Uninline some fslocks.c functions

uninline some file locking functions

add/remove: 3/0 grow/shrink: 0/15 up/down: 256/-1525 (-1269)
function                                     old     new   delta
locks_free_lock                                -     134    +134
posix_same_owner                               -      69     +69
__locks_delete_block                           -      53     +53
posix_locks_conflict                         126     108     -18
locks_remove_posix                           266     237     -29
locks_wake_up_blocks                         121      87     -34
locks_block_on_timeout                        83      47     -36
locks_insert_block                           157     120     -37
locks_delete_block                            62      23     -39
posix_unblock_lock                           104      59     -45
posix_locks_deadlock                         162     100     -62
locks_delete_lock                            228     119    -109
sys_flock                                    338     217    -121
__break_lease                                600     474    -126
lease_init                                   252     122    -130
fcntl_setlk64                                793     649    -144
fcntl_setlk                                  793     649    -144
__posix_lock_file                           1477    1026    -451
Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5d2bea45
...@@ -154,7 +154,7 @@ static struct file_lock *locks_alloc_lock(void) ...@@ -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) ...@@ -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 static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment