diff options
| author | Jeff Layton <jlayton@redhat.com> | 2014-02-03 12:13:07 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2014-03-31 08:24:42 -0400 |
| commit | 6ca10ed8edfd84b1930affdae8ffaa787057296b (patch) | |
| tree | 944bf384b477e1e402f290a9209ff123fbe6cd54 | |
| parent | 46dad7603f21d64207820580c0bafd47934686d4 (diff) | |
locks: remove "inline" qualifier from fl_link manipulation functions
It's best to let the compiler decide that.
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
| -rw-r--r-- | fs/locks.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/locks.c b/fs/locks.c index 5e28612120c2..049a14402ee4 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -511,8 +511,7 @@ static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) | |||
| 511 | } | 511 | } |
| 512 | 512 | ||
| 513 | /* Must be called with the i_lock held! */ | 513 | /* Must be called with the i_lock held! */ |
| 514 | static inline void | 514 | static void locks_insert_global_locks(struct file_lock *fl) |
| 515 | locks_insert_global_locks(struct file_lock *fl) | ||
| 516 | { | 515 | { |
| 517 | lg_local_lock(&file_lock_lglock); | 516 | lg_local_lock(&file_lock_lglock); |
| 518 | fl->fl_link_cpu = smp_processor_id(); | 517 | fl->fl_link_cpu = smp_processor_id(); |
| @@ -521,8 +520,7 @@ locks_insert_global_locks(struct file_lock *fl) | |||
| 521 | } | 520 | } |
| 522 | 521 | ||
| 523 | /* Must be called with the i_lock held! */ | 522 | /* Must be called with the i_lock held! */ |
| 524 | static inline void | 523 | static void locks_delete_global_locks(struct file_lock *fl) |
| 525 | locks_delete_global_locks(struct file_lock *fl) | ||
| 526 | { | 524 | { |
| 527 | /* | 525 | /* |
| 528 | * Avoid taking lock if already unhashed. This is safe since this check | 526 | * Avoid taking lock if already unhashed. This is safe since this check |
| @@ -544,14 +542,12 @@ posix_owner_key(struct file_lock *fl) | |||
| 544 | return (unsigned long)fl->fl_owner; | 542 | return (unsigned long)fl->fl_owner; |
| 545 | } | 543 | } |
| 546 | 544 | ||
| 547 | static inline void | 545 | static void locks_insert_global_blocked(struct file_lock *waiter) |
| 548 | locks_insert_global_blocked(struct file_lock *waiter) | ||
| 549 | { | 546 | { |
| 550 | hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter)); | 547 | hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter)); |
| 551 | } | 548 | } |
| 552 | 549 | ||
| 553 | static inline void | 550 | static void locks_delete_global_blocked(struct file_lock *waiter) |
| 554 | locks_delete_global_blocked(struct file_lock *waiter) | ||
| 555 | { | 551 | { |
| 556 | hash_del(&waiter->fl_link); | 552 | hash_del(&waiter->fl_link); |
| 557 | } | 553 | } |
