diff options
| author | Jeff Layton <jlayton@redhat.com> | 2014-02-03 18:13:08 +0100 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2014-03-31 14:24:42 +0200 |
| commit | 78ed8a13382b1354e95d0f2233577eba15cb8171 (patch) | |
| tree | 1dfe2f7e7baee66928fe1a9c17d795919fe0098c | |
| parent | locks: consolidate checks for compatible filp->f_mode values in setlk handlers (diff) | |
| download | linux-78ed8a13382b1354e95d0f2233577eba15cb8171.tar.xz linux-78ed8a13382b1354e95d0f2233577eba15cb8171.zip | |
locks: rename locks_remove_flock to locks_remove_file
This function currently removes leases in addition to flock locks and in
a later patch we'll have it deal with file-private locks 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.
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
| -rw-r--r-- | fs/file_table.c | 2 | ||||
| -rw-r--r-- | fs/locks.c | 2 | ||||
| -rw-r--r-- | 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 5fff9030be34..468543c1973d 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 4cd25781b0a4..4d4e790150e0 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2196,7 +2196,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 df8474408331..7527d96913d3 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; } |