From: Jeff Layton <jlayton@poochiereds.net>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Dmitry Vyukov <dvyukov@google.com>,
"J. Bruce Fields" <bfields@fieldses.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
syzkaller <syzkaller@googlegroups.com>,
Kostya Serebryany <kcc@google.com>,
Alexander Potapenko <glider@google.com>,
Sasha Levin <sasha.levin@oracle.com>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH v2 6/6] locks: rename __posix_lock_file to posix_lock_inode
Date: Fri, 8 Jan 2016 08:50:14 -0500 [thread overview]
Message-ID: <1452261014-1682-7-git-send-email-jeff.layton@primarydata.com> (raw)
In-Reply-To: <1452261014-1682-1-git-send-email-jeff.layton@primarydata.com>
...a more descriptive name and we can drop the double underscore prefix.
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
---
fs/locks.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index ca272eb63c30..a91f4ab00a90 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -961,7 +961,8 @@ out:
return error;
}
-static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
+static int posix_lock_inode(struct inode *inode, struct file_lock *request,
+ struct file_lock *conflock)
{
struct file_lock *fl, *tmp;
struct file_lock *new_fl = NULL;
@@ -1191,7 +1192,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
- return __posix_lock_file(file_inode(filp), fl, conflock);
+ return posix_lock_inode(file_inode(filp), fl, conflock);
}
EXPORT_SYMBOL(posix_lock_file);
@@ -1207,7 +1208,7 @@ static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)
int error;
might_sleep ();
for (;;) {
- error = __posix_lock_file(inode, fl, NULL);
+ error = posix_lock_inode(inode, fl, NULL);
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
@@ -1290,7 +1291,7 @@ int locks_mandatory_area(int read_write, struct inode *inode,
if (filp) {
fl.fl_owner = filp;
fl.fl_flags &= ~FL_SLEEP;
- error = __posix_lock_file(inode, &fl, NULL);
+ error = posix_lock_inode(inode, &fl, NULL);
if (!error)
break;
}
@@ -1298,7 +1299,7 @@ int locks_mandatory_area(int read_write, struct inode *inode,
if (sleep)
fl.fl_flags |= FL_SLEEP;
fl.fl_owner = current->files;
- error = __posix_lock_file(inode, &fl, NULL);
+ error = posix_lock_inode(inode, &fl, NULL);
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
--
2.5.0
prev parent reply other threads:[~2016-01-08 13:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 10:37 fs: WARNING in locks_free_lock_context() Dmitry Vyukov
2015-12-23 13:54 ` Jeff Layton
2016-02-03 18:19 ` William Dauchy
2016-02-03 18:26 ` Jeff Layton
2016-02-03 18:28 ` William Dauchy
2016-01-08 2:22 ` [PATCH] locks: fix unlock when fcntl_setlk races with a close Jeff Layton
2016-01-08 12:48 ` Jeff Layton
2016-01-08 16:16 ` J. Bruce Fields
2016-01-08 13:50 ` [PATCH v2 0/6] locks: better debugging and fix for setlk/close race handling Jeff Layton
2016-01-08 13:50 ` [PATCH v2 1/6] locks: fix unlock when fcntl_setlk races with a close Jeff Layton
2016-01-08 15:55 ` J. Bruce Fields
2016-01-08 16:11 ` Jeff Layton
2016-01-08 16:21 ` J. Bruce Fields
2016-01-08 16:22 ` J. Bruce Fields
2016-01-08 16:26 ` J. Bruce Fields
2016-01-08 13:50 ` [PATCH v2 2/6] locks: don't check for race with close when setting OFD lock Jeff Layton
2016-01-08 13:50 ` [PATCH v2 3/6] locks: sprinkle some tracepoints around the file locking code Jeff Layton
2016-01-08 13:50 ` [PATCH v2 4/6] locks: pass inode pointer to locks_free_lock_context Jeff Layton
2016-01-08 13:50 ` [PATCH v2 5/6] locks: prink more detail when there are leaked locks Jeff Layton
2016-01-08 13:50 ` Jeff Layton [this message]
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=1452261014-1682-7-git-send-email-jeff.layton@primarydata.com \
--to=jlayton@poochiereds.net \
--cc=bfields@fieldses.org \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=kcc@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sasha.levin@oracle.com \
--cc=syzkaller@googlegroups.com \
--cc=viro@zeniv.linux.org.uk \
/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