Skip to content

Commit

Permalink
locks: remove "inline" qualifier from fl_link manipulation functions
Browse files Browse the repository at this point in the history
It's best to let the compiler decide that.

Acked-by: J. Bruce Fields <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
  • Loading branch information
jtlayton committed Mar 31, 2014
1 parent 46dad76 commit 6ca10ed
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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! */
static inline void
locks_insert_global_locks(struct file_lock *fl)
static void locks_insert_global_locks(struct file_lock *fl)
{
lg_local_lock(&file_lock_lglock);
fl->fl_link_cpu = smp_processor_id();
Expand All @@ -521,8 +520,7 @@ locks_insert_global_locks(struct file_lock *fl)
}

/* Must be called with the i_lock held! */
static inline void
locks_delete_global_locks(struct file_lock *fl)
static void locks_delete_global_locks(struct file_lock *fl)
{
/*
* Avoid taking lock if already unhashed. This is safe since this check
Expand All @@ -544,14 +542,12 @@ posix_owner_key(struct file_lock *fl)
return (unsigned long)fl->fl_owner;
}

static inline void
locks_insert_global_blocked(struct file_lock *waiter)
static void locks_insert_global_blocked(struct file_lock *waiter)
{
hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter));
}

static inline void
locks_delete_global_blocked(struct file_lock *waiter)
static void locks_delete_global_blocked(struct file_lock *waiter)
{
hash_del(&waiter->fl_link);
}
Expand Down

0 comments on commit 6ca10ed

Please sign in to comment.