From: Jeff Layton <jlayton@redhat.com>
To: linux-fsdevel@vger.kernel.org
Cc: nfs-ganesha-devel@lists.sourceforge.net,
samba-technical@lists.samba.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 03/13] locks: remove "inline" qualifier from fl_link manipulation functions
Date: Thu, 19 Dec 2013 08:34:15 -0500 [thread overview]
Message-ID: <1387460065-28269-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1387460065-28269-1-git-send-email-jlayton@redhat.com>
It's best to let the compiler decide that.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/locks.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 5e28612..049a144 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.4.2
next prev parent reply other threads:[~2013-12-19 13:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 13:34 [PATCH v4 00/13] locks: implement "filp-private" (aka UNPOSIX) locks Jeff Layton
2013-12-19 13:34 ` [PATCH v4 01/13] locks: close potential race between setlease and open Jeff Layton
2013-12-19 13:34 ` [PATCH v4 02/13] locks: clean up comment typo Jeff Layton
2013-12-19 13:34 ` Jeff Layton [this message]
2013-12-19 13:34 ` [PATCH v4 04/13] locks: add __acquires and __releases annotations to locks_start and locks_stop Jeff Layton
2013-12-19 13:34 ` [PATCH v4 05/13] locks: eliminate BUG() call when there's an unexpected lock on file close Jeff Layton
2013-12-19 13:34 ` [PATCH v4 06/13] locks: consolidate common code in the flock_to_posix_lock routines Jeff Layton
2013-12-19 13:34 ` [PATCH v4 07/13] locks: simplify overflow checking Jeff Layton
2013-12-19 13:34 ` [PATCH v4 08/13] locks: consolidate checks for compatible filp->f_mode values in setlk handlers Jeff Layton
2013-12-19 13:34 ` [PATCH v4 09/13] locks: don't reference original flock struct in F_GETLK handlers Jeff Layton
2013-12-19 13:34 ` [PATCH v4 10/13] locks: rename locks_remove_flock to locks_remove_file Jeff Layton
2013-12-19 13:34 ` [PATCH v4 11/13] locks: show private lock types in /proc/locks Jeff Layton
2013-12-19 13:34 ` [PATCH v4 12/13] locks: report l_pid as -1 for FL_FILE_PVT locks Jeff Layton
2013-12-19 13:34 ` [PATCH v4 13/13] locks: add new "private" lock type that is owned by the filp Jeff Layton
2013-12-19 13:52 ` [PATCH v4 00/13] locks: implement "filp-private" (aka UNPOSIX) locks Scott Lovenberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387460065-28269-4-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nfs-ganesha-devel@lists.sourceforge.net \
--cc=samba-technical@lists.samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).