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>
Change-Id: I1289cfbc02eb778532e984a29adffb02a9370cc1
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>

diff --git a/fs/file_table.c b/fs/file_table.c
index 28f02a7cbba189203bf9a77f454db0e8571292a2..ff3177707493d045e70b0fa67e5fe41da362f167 100644 (file)
--- 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 && file->f_op->fasync)

diff --git a/fs/locks.c b/fs/locks.c
index f7b1de7e67358b8ae5006be68a4679d70e67aa8c..74c9f1db6fca89bdcd05e912d52cd1b9783184ab 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2062,7 +2062,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 e752531ae0863eaeefdbdbdee9bcdc96871ac21c..66fb6fdd9f107a9e5e0551c75e79f17985fd9b3c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1047,7 +1047,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 *);
@@ -1121,7 +1121,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;
 }