From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 03/17] locks: remove "inline" qualifier from fl_link manipulation functions Date: Wed, 19 Mar 2014 16:45:47 -0400 Message-ID: <1395261961-10855-4-git-send-email-jlayton@redhat.com> References: <1395261961-10855-1-git-send-email-jlayton@redhat.com> Cc: linux-fsdevel@vger.kernel.org, bfields@fieldses.org To: viro@ZenIV.linux.org.uk Return-path: Received: from mail-qc0-f173.google.com ([209.85.216.173]:41712 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754769AbaCSUqR (ORCPT ); Wed, 19 Mar 2014 16:46:17 -0400 Received: by mail-qc0-f173.google.com with SMTP id r5so10363749qcx.4 for ; Wed, 19 Mar 2014 13:46:17 -0700 (PDT) In-Reply-To: <1395261961-10855-1-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: It's best to let the compiler decide that. Reported-by: Stephen Rothwell Signed-off-by: Jeff Layton --- fs/locks.c | 12 ++++-------- 1 file 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) } /* 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(); @@ -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 @@ -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); } -- 1.8.5.3