diff options
| author | Matt Mackall <mpm@selenic.com> | 2006-01-08 04:05:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:10 -0500 |
| commit | 33443c42f4ffa5ca23b3323234bcb1a78e85d9db (patch) | |
| tree | b524ba077d49afb7633088c66a2ef77fede0ccd7 /fs/locks.c | |
| parent | 5d2bea4582d20cb24085152acaa29b95c05cdcf8 (diff) | |
[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: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/locks.c')
| -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); |