diff --git a/fs/file_table.c b/fs/file_table.c
index a01710a6ff3b..3d8809cba3af 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -232,7 +232,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 d4f1d89d9bc6..224f443a6b4b 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2064,7 +2064,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 = filp->f_path.dentry->d_inode;
 	struct file_lock *fl;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6c9e6ccf00b2..fc89997214e7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1259,7 +1259,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 *);
@@ -1333,7 +1333,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;
 }