mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-04 05:11:46 +00:00
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>
This commit is contained in:
parent
46dad7603f
commit
6ca10ed8ed
1 changed files with 4 additions and 8 deletions
12
fs/locks.c
12
fs/locks.c
|
@ -511,8 +511,7 @@ static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Must be called with the i_lock held! */
|
/* Must be called with the i_lock held! */
|
||||||
static inline void
|
static void locks_insert_global_locks(struct file_lock *fl)
|
||||||
locks_insert_global_locks(struct file_lock *fl)
|
|
||||||
{
|
{
|
||||||
lg_local_lock(&file_lock_lglock);
|
lg_local_lock(&file_lock_lglock);
|
||||||
fl->fl_link_cpu = smp_processor_id();
|
fl->fl_link_cpu = smp_processor_id();
|
||||||
|
@ -521,8 +520,7 @@ locks_insert_global_locks(struct file_lock *fl)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Must be called with the i_lock held! */
|
/* Must be called with the i_lock held! */
|
||||||
static inline void
|
static void locks_delete_global_locks(struct file_lock *fl)
|
||||||
locks_delete_global_locks(struct file_lock *fl)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Avoid taking lock if already unhashed. This is safe since this check
|
* Avoid taking lock if already unhashed. This is safe since this check
|
||||||
|
@ -544,14 +542,12 @@ posix_owner_key(struct file_lock *fl)
|
||||||
return (unsigned long)fl->fl_owner;
|
return (unsigned long)fl->fl_owner;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static void locks_insert_global_blocked(struct file_lock *waiter)
|
||||||
locks_insert_global_blocked(struct file_lock *waiter)
|
|
||||||
{
|
{
|
||||||
hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter));
|
hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter));
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static void locks_delete_global_blocked(struct file_lock *waiter)
|
||||||
locks_delete_global_blocked(struct file_lock *waiter)
|
|
||||||
{
|
{
|
||||||
hash_del(&waiter->fl_link);
|
hash_del(&waiter->fl_link);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue