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 10/13] locks: rename locks_remove_flock to locks_remove_file
Date: Thu, 19 Dec 2013 08:34:22 -0500 [thread overview]
Message-ID: <1387460065-28269-11-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1387460065-28269-1-git-send-email-jlayton@redhat.com>
This function currently removes leases in addition to flock locks and in
a later patch we'll have it deal with a new type of POSIX lock too.
Rename it to locks_remove_file to indicate that it removes locks that
are associated with a particular struct file, and not just flock locks.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/file_table.c | 2 +-
fs/locks.c | 2 +-
include/linux/fs.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/file_table.c b/fs/file_table.c
index 5fff903..468543c 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -234,7 +234,7 @@ static void __fput(struct file *file)
* in the file cleanup chain.
*/
eventpoll_release(file);
- locks_remove_flock(file);
+ locks_remove_file(file);
if (unlikely(file->f_flags & FASYNC)) {
if (file->f_op->fasync)
diff --git a/fs/locks.c b/fs/locks.c
index 8180141..a217c2c 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2197,7 +2197,7 @@ EXPORT_SYMBOL(locks_remove_posix);
/*
* This function is called on the last close of an open file.
*/
-void locks_remove_flock(struct file *filp)
+void locks_remove_file(struct file *filp)
{
struct inode * inode = file_inode(filp);
struct file_lock *fl;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 04be202..51974e0 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1012,7 +1012,7 @@ extern struct file_lock * locks_alloc_lock(void);
extern void locks_copy_lock(struct file_lock *, struct file_lock *);
extern void __locks_copy_lock(struct file_lock *, const struct file_lock *);
extern void locks_remove_posix(struct file *, fl_owner_t);
-extern void locks_remove_flock(struct file *);
+extern void locks_remove_file(struct file *);
extern void locks_release_private(struct file_lock *);
extern void posix_test_lock(struct file *, struct file_lock *);
extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
@@ -1083,7 +1083,7 @@ static inline void locks_remove_posix(struct file *filp, fl_owner_t owner)
return;
}
-static inline void locks_remove_flock(struct file *filp)
+static inline void locks_remove_file(struct file *filp)
{
return;
}
--
1.8.4.2
next prev parent reply other threads:[~2013-12-19 13:35 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 ` [PATCH v4 03/13] locks: remove "inline" qualifier from fl_link manipulation functions Jeff Layton
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 ` Jeff Layton [this message]
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-11-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).